[kotlin][ktor] add set JSON as the ContentType header for ktor projects

samples


revert content type

Author: Marek00Malik

modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache

@@ -11,7 +11,7 @@ wrapper {
 buildscript {
     ext.kotlin_version = '1.6.10'
     {{#jvm-ktor}}
-    ext.ktor_version = '2.0.3'
+    ext.ktor_version = '2.1.2'
     {{/jvm-ktor}}
     {{#jvm-retrofit2}}
     ext.retrofitVersion = '2.9.0'

modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-ktor/infrastructure/ApiClient.kt.mustache

@@ -12,6 +12,7 @@ import io.ktor.client.request.parameter
 import io.ktor.client.request.request
 import io.ktor.client.request.setBody
 import io.ktor.client.statement.HttpResponse
+import io.ktor.http.contentType
 import io.ktor.http.HttpHeaders
 import io.ktor.http.HttpMethod
 import io.ktor.http.Parameters
@@ -34,11 +35,6 @@ import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
 import com.fasterxml.jackson.core.util.DefaultIndenter
 import com.fasterxml.jackson.core.util.DefaultPrettyPrinter
 {{/jackson}}
-import org.openapitools.client.auth.ApiKeyAuth
-import org.openapitools.client.auth.Authentication
-import org.openapitools.client.auth.HttpBasicAuth
-import org.openapitools.client.auth.HttpBearerAuth
-import org.openapitools.client.auth.OAuth
 import {{packageName}}.auth.*
 
 {{#nonPublicApi}}internal {{/nonPublicApi}}open class ApiClient(
@@ -111,7 +107,7 @@ import {{packageName}}.auth.*
      * @param username Username
      */
     fun setUsername(username: String) {
-        val auth = authentications.values.firstOrNull { it is HttpBasicAuth } as HttpBasicAuth?
+        val auth = authentications?.values?.firstOrNull { it is HttpBasicAuth } as HttpBasicAuth?
                 ?: throw Exception("No HTTP basic authentication configured")
         auth.username = username
     }
@@ -122,7 +118,7 @@ import {{packageName}}.auth.*
      * @param password Password
      */
     fun setPassword(password: String) {
-        val auth = authentications.values.firstOrNull { it is HttpBasicAuth } as HttpBasicAuth?
+        val auth = authentications?.values?.firstOrNull { it is HttpBasicAuth } as HttpBasicAuth?
                 ?: throw Exception("No HTTP basic authentication configured")
         auth.password = password
     }
@@ -134,7 +130,7 @@ import {{packageName}}.auth.*
      * @param paramName The name of the API key parameter, or null or set the first key.
      */
     fun setApiKey(apiKey: String, paramName: String? = null) {
-        val auth = authentications.values.firstOrNull { it is ApiKeyAuth && (paramName == null || paramName == it.paramName)} as ApiKeyAuth?
+        val auth = authentications?.values?.firstOrNull { it is ApiKeyAuth && (paramName == null || paramName == it.paramName)} as ApiKeyAuth?
                 ?: throw Exception("No API key authentication configured")
         auth.apiKey = apiKey
     }
@@ -146,7 +142,7 @@ import {{packageName}}.auth.*
      * @param paramName The name of the API key parameter, or null or set the first key.
      */
     fun setApiKeyPrefix(apiKeyPrefix: String, paramName: String? = null) {
-        val auth = authentications.values.firstOrNull { it is ApiKeyAuth && (paramName == null || paramName == it.paramName) } as ApiKeyAuth?
+        val auth = authentications?.values?.firstOrNull { it is ApiKeyAuth && (paramName == null || paramName == it.paramName) } as ApiKeyAuth?
                 ?: throw Exception("No API key authentication configured")
         auth.apiKeyPrefix = apiKeyPrefix
     }
@@ -157,7 +153,7 @@ import {{packageName}}.auth.*
      * @param accessToken Access token
      */
     fun setAccessToken(accessToken: String) {
-        val auth = authentications.values.firstOrNull { it is OAuth } as OAuth?
+        val auth = authentications?.values?.firstOrNull { it is OAuth } as OAuth?
                 ?: throw Exception("No OAuth2 authentication configured")
         auth.accessToken = accessToken
     }
@@ -168,7 +164,7 @@ import {{packageName}}.auth.*
      * @param bearerToken The bearer token.
      */
     fun setBearerToken(bearerToken: String) {
-        val auth = authentications.values.firstOrNull { it is HttpBearerAuth } as HttpBearerAuth?
+        val auth = authentications?.values?.firstOrNull { it is HttpBearerAuth } as HttpBearerAuth?
                 ?: throw Exception("No Bearer authentication configured")
         auth.bearerToken = bearerToken
     }
@@ -199,8 +195,9 @@ import {{packageName}}.auth.*
             }
             this.method = requestConfig.method.httpMethod
             headers.filter { header -> !UNSAFE_HEADERS.contains(header.key) }.forEach { header -> this.header(header.key, header.value) }
-            if (requestConfig.method in listOf(RequestMethod.PUT, RequestMethod.POST, RequestMethod.PATCH))
+            if (requestConfig.method in listOf(RequestMethod.PUT, RequestMethod.POST, RequestMethod.PATCH)) {
                 setBody(body)
+            }
         }
     }
 

modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/infrastructure/ApiClient.kt.mustache

@@ -11,10 +11,10 @@ import io.ktor.client.request.forms.MultiPartFormDataContent
 import io.ktor.client.request.header
 import io.ktor.client.request.parameter
 import io.ktor.client.statement.HttpResponse
+import io.ktor.http.ContentType.Application.Json
 import io.ktor.http.*
 import io.ktor.http.content.PartData
 import kotlin.Unit
-import kotlinx.serialization.json.Json
 
 import {{packageName}}.auth.*
 
@@ -153,9 +153,9 @@ import {{packageName}}.auth.*
             }
             this.method = requestConfig.method.httpMethod
             headers.filter { header -> !UNSAFE_HEADERS.contains(header.key) }.forEach { header -> this.header(header.key, header.value) }
-            if (requestConfig.method in listOf(RequestMethod.PUT, RequestMethod.POST, RequestMethod.PATCH))
+            if (requestConfig.method in listOf(RequestMethod.PUT, RequestMethod.POST, RequestMethod.PATCH)) {
                 this.setBody(body)
-
+            }
         }
     }
 

samples/client/petstore/kotlin-allOff-discriminator/.openapi-generator/VERSION

@@ -1 +1 @@
-6.2.1-SNAPSHOT
+6.1.0-SNAPSHOT

samples/client/petstore/kotlin-array-simple-string-jvm-okhttp3/.openapi-generator/VERSION

@@ -1 +1 @@
-6.2.1-SNAPSHOT
+6.1.0-SNAPSHOT

samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/.openapi-generator/VERSION

@@ -1 +1 @@
-6.2.1-SNAPSHOT
+6.1.0-SNAPSHOT

samples/client/petstore/kotlin-array-simple-string-jvm-volley/.openapi-generator/VERSION

@@ -1 +1 @@
-6.2.1-SNAPSHOT
+6.1.0-SNAPSHOT

samples/client/petstore/kotlin-array-simple-string-multiplatform/.openapi-generator/VERSION

@@ -1 +1 @@
-6.2.1-SNAPSHOT
+6.1.0-SNAPSHOT

samples/client/petstore/kotlin-array-simple-string-multiplatform/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt

@@ -11,6 +11,7 @@ import io.ktor.client.request.forms.MultiPartFormDataContent
 import io.ktor.client.request.header
 import io.ktor.client.request.parameter
 import io.ktor.client.statement.HttpResponse
+import io.ktor.http.ContentType.Application.Json
 import io.ktor.http.*
 import io.ktor.http.content.PartData
 import kotlin.Unit
@@ -142,9 +143,10 @@ open class ApiClient(
             }
             this.method = requestConfig.method.httpMethod
             headers.filter { header -> !UNSAFE_HEADERS.contains(header.key) }.forEach { header -> this.header(header.key, header.value) }
-            if (requestConfig.method in listOf(RequestMethod.PUT, RequestMethod.POST, RequestMethod.PATCH))
+            if (requestConfig.method in listOf(RequestMethod.PUT, RequestMethod.POST, RequestMethod.PATCH)) {
+                this.contentType(Json)
                 this.setBody(body)
-
+            }
         }
     }
 

samples/client/petstore/kotlin-bigdecimal-default-multiplatform/.openapi-generator/VERSION

@@ -1 +1 @@
-6.2.1-SNAPSHOT
+6.1.0-SNAPSHOT