loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[Kotlin][retrofit2] replace okhttpclient with callfactory (#9451)

Browse Source 
* [Kotlin][Retrofit][#9448] Replace OkHttpClient parameter with Call.Factory.

* [Kotlin][Retrofit][#9448] Update sample project.
This commit is contained in:
Stefan Hanselmann 2021-05-28 15:50:28 +02:00 committed by GitHub
parent 763f65f293
commit 1b6fd2dd7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/infrastructure/ApiClient.kt.mustache vendored
View File

@ -21,6 +21,7 @@ import {{packageName}}.auth.HttpBearerAuth
{{/authMethods}} {{/authMethods}}
{{/hasAuthMethods}} {{/hasAuthMethods}}
import okhttp3.Call
import okhttp3.Interceptor import okhttp3.Interceptor
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
import retrofit2.Retrofit import retrofit2.Retrofit
@ -56,7 +57,7 @@ import okhttp3.MediaType.Companion.toMediaType
private var baseUrl: String = defaultBasePath, private var baseUrl: String = defaultBasePath,
private val okHttpClientBuilder: OkHttpClient.Builder? = null{{^kotlinx_serialization}}, private val okHttpClientBuilder: OkHttpClient.Builder? = null{{^kotlinx_serialization}},
private val serializerBuilder: {{#gson}}Gson{{/gson}}{{#moshi}}Moshi.{{/moshi}}Builder = Serializer.{{#gson}}gson{{/gson}}{{#moshi}}moshi{{/moshi}}Builder{{/kotlinx_serialization}}, private val serializerBuilder: {{#gson}}Gson{{/gson}}{{#moshi}}Moshi.{{/moshi}}Builder = Serializer.{{#gson}}gson{{/gson}}{{#moshi}}moshi{{/moshi}}Builder{{/kotlinx_serialization}},
private val okHttpClient : OkHttpClient? = null, private val callFactory : Call.Factory? = null,
private val converterFactory: Converter.Factory? = null, private val converterFactory: Converter.Factory? = null,
) { ) {
private val apiAuthorizations = mutableMapOf<String, Interceptor>() private val apiAuthorizations = mutableMapOf<String, Interceptor>()
@ -303,8 +304,8 @@ import okhttp3.MediaType.Companion.toMediaType
} }
fun <S> createService(serviceClass: Class<S>): S { fun <S> createService(serviceClass: Class<S>): S {
val usedClient = this.okHttpClient ?: clientBuilder.build() val usedCallFactory = this.callFactory ?: clientBuilder.build()
return retrofitBuilder.client(usedClient).build().create(serviceClass) return retrofitBuilder.callFactory(usedCallFactory).build().create(serviceClass)
} }
private fun normalizeBaseUrl() { private fun normalizeBaseUrl() {

7
samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
View File

@ -7,6 +7,7 @@ import org.openapitools.client.auth.OAuth
import org.openapitools.client.auth.OAuth.AccessTokenListener import org.openapitools.client.auth.OAuth.AccessTokenListener
import org.openapitools.client.auth.OAuthFlow import org.openapitools.client.auth.OAuthFlow
import okhttp3.Call
import okhttp3.Interceptor import okhttp3.Interceptor
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
import retrofit2.Retrofit import retrofit2.Retrofit
@ -21,7 +22,7 @@ import okhttp3.MediaType.Companion.toMediaType
class ApiClient( class ApiClient(
private var baseUrl: String = defaultBasePath, private var baseUrl: String = defaultBasePath,
private val okHttpClientBuilder: OkHttpClient.Builder? = null, private val okHttpClientBuilder: OkHttpClient.Builder? = null,
private val okHttpClient : OkHttpClient? = null, private val callFactory : Call.Factory? = null,
private val converterFactory: Converter.Factory? = null, private val converterFactory: Converter.Factory? = null,
) { ) {
private val apiAuthorizations = mutableMapOf<String, Interceptor>() private val apiAuthorizations = mutableMapOf<String, Interceptor>()
@ -180,8 +181,8 @@ class ApiClient(
} }
fun <S> createService(serviceClass: Class<S>): S { fun <S> createService(serviceClass: Class<S>): S {
val usedClient = this.okHttpClient ?: clientBuilder.build() val usedCallFactory = this.callFactory ?: clientBuilder.build()
return retrofitBuilder.client(usedClient).build().create(serviceClass) return retrofitBuilder.callFactory(usedCallFactory).build().create(serviceClass)
} }
private fun normalizeBaseUrl() { private fun normalizeBaseUrl() {

7
samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
View File

@ -7,6 +7,7 @@ import org.openapitools.client.auth.OAuth
import org.openapitools.client.auth.OAuth.AccessTokenListener import org.openapitools.client.auth.OAuth.AccessTokenListener
import org.openapitools.client.auth.OAuthFlow import org.openapitools.client.auth.OAuthFlow
import okhttp3.Call
import okhttp3.Interceptor import okhttp3.Interceptor
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
import retrofit2.Retrofit import retrofit2.Retrofit
@ -22,7 +23,7 @@ class ApiClient(
private var baseUrl: String = defaultBasePath, private var baseUrl: String = defaultBasePath,
private val okHttpClientBuilder: OkHttpClient.Builder? = null, private val okHttpClientBuilder: OkHttpClient.Builder? = null,
private val serializerBuilder: Moshi.Builder = Serializer.moshiBuilder, private val serializerBuilder: Moshi.Builder = Serializer.moshiBuilder,
private val okHttpClient : OkHttpClient? = null, private val callFactory : Call.Factory? = null,
private val converterFactory: Converter.Factory? = null, private val converterFactory: Converter.Factory? = null,
) { ) {
private val apiAuthorizations = mutableMapOf<String, Interceptor>() private val apiAuthorizations = mutableMapOf<String, Interceptor>()
@ -183,8 +184,8 @@ class ApiClient(
} }
fun <S> createService(serviceClass: Class<S>): S { fun <S> createService(serviceClass: Class<S>): S {
val usedClient = this.okHttpClient ?: clientBuilder.build() val usedCallFactory = this.callFactory ?: clientBuilder.build()
return retrofitBuilder.client(usedClient).build().create(serviceClass) return retrofitBuilder.callFactory(usedCallFactory).build().create(serviceClass)
} }
private fun normalizeBaseUrl() { private fun normalizeBaseUrl() {

7
samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
View File

@ -7,6 +7,7 @@ import org.openapitools.client.auth.OAuth
import org.openapitools.client.auth.OAuth.AccessTokenListener import org.openapitools.client.auth.OAuth.AccessTokenListener
import org.openapitools.client.auth.OAuthFlow import org.openapitools.client.auth.OAuthFlow
import okhttp3.Call
import okhttp3.Interceptor import okhttp3.Interceptor
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
import retrofit2.Retrofit import retrofit2.Retrofit
@ -21,7 +22,7 @@ class ApiClient(
private var baseUrl: String = defaultBasePath, private var baseUrl: String = defaultBasePath,
private val okHttpClientBuilder: OkHttpClient.Builder? = null, private val okHttpClientBuilder: OkHttpClient.Builder? = null,
private val serializerBuilder: Moshi.Builder = Serializer.moshiBuilder, private val serializerBuilder: Moshi.Builder = Serializer.moshiBuilder,
private val okHttpClient : OkHttpClient? = null, private val callFactory : Call.Factory? = null,
private val converterFactory: Converter.Factory? = null, private val converterFactory: Converter.Factory? = null,
) { ) {
private val apiAuthorizations = mutableMapOf<String, Interceptor>() private val apiAuthorizations = mutableMapOf<String, Interceptor>()
@ -180,8 +181,8 @@ class ApiClient(
} }
fun <S> createService(serviceClass: Class<S>): S { fun <S> createService(serviceClass: Class<S>): S {
val usedClient = this.okHttpClient ?: clientBuilder.build() val usedCallFactory = this.callFactory ?: clientBuilder.build()
return retrofitBuilder.client(usedClient).build().create(serviceClass) return retrofitBuilder.callFactory(usedCallFactory).build().create(serviceClass)
} }
private fun normalizeBaseUrl() { private fun normalizeBaseUrl() {