Skip to content

[Kotlin] Make ApiClient in jvm-retrofit2 be able to use own OkHttpClient #6855

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 13 commits into from
Closed

[Kotlin] Make ApiClient in jvm-retrofit2 be able to use own OkHttpClient #6855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c46b027
Merge pull request #1 from OpenAPITools/master
tgerth Jun 17, 2020
b4fec1c
set adapterBuilder.client() only if okBuilder was used in retrofit2
Jun 17, 2020
6f646db
updated the samples
Jun 18, 2020
b0855b3
added field okHttpClient and updated samples
Jun 22, 2020
26f777a
bug fixed, added exception if okBuilder is null
Jun 26, 2020
ef3a88e
added semicolon
Jun 26, 2020
d7634ae
added space, changed Exception to RuntimeException and changed its me…
Jun 29, 2020
d1de6b8
updated the samples
Jun 29, 2020
ccf3c20
Merge pull request #2 from OpenAPITools/master
tgerth Jun 30, 2020
6d568ed
added field okHttpClient, added constructor, adapted createService
Jul 3, 2020
1a638e1
updated sample
Jul 3, 2020
763d7cb
Merge pull request #3 from OpenAPITools/master
tgerth Jul 3, 2020
9235f49
Merge branch 'master' into kotlin-jvm-retrofit2-apiclient
Jul 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion ...main/resources/kotlin-client/libraries/jvm-retrofit2/infrastructure/ApiClient.kt.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,17 @@ import retrofit2.converter.moshi.MoshiConverterFactory
level = HttpLoggingInterceptor.Level.BODY
})
}

private var okHttpClient?: OkHttpClient = null

constructor(
baseUrl: String = defaultBasePath,
okHttpClientBuilder: OkHttpClient.Builder? = null,
serializerBuilder: {{#gson}}Gson{{/gson}}{{#moshi}}Moshi.{{/moshi}}Builder = Serializer.{{#gson}}gson{{/gson}}{{#moshi}}moshi{{/moshi}}Builder
okClient: OkHttpClient? = null
) : this(baseUrl, okHttpClientBuilder, serializerBuilder) {
this.okHttpClient = okClient
}

init {
normalizeBaseUrl()
Expand Down Expand Up @@ -281,7 +292,9 @@ import retrofit2.converter.moshi.MoshiConverterFactory
}

fun <S> createService(serviceClass: Class<S>): S {
return retrofitBuilder.client(clientBuilder.build()).build().create(serviceClass)
var usedClient: OkHttpClient? = null
this.okHttpClient?.let { usedClient = it } ?: run {usedClient = clientBuilder.build()}
return retrofitBuilder.client(usedClient).build().create(serviceClass)
}

private fun normalizeBaseUrl() {
Expand Down
15 changes: 14 additions & 1 deletion ...tore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,17 @@ class ApiClient(
level = HttpLoggingInterceptor.Level.BODY
})
}

private var okHttpClient?: OkHttpClient = null

constructor(
Copy link
Contributor

@4brunu 4brunu Jul 6, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tgerth we don't need a new constructor, you can add the private val okHttpClient : OkHttpClient? = null to the constructor at line 18, because it has a default value.
And with this change, you can remove this constructor, and the var in line 49.

baseUrl: String = defaultBasePath,
okHttpClientBuilder: OkHttpClient.Builder? = null,
serializerBuilder: Moshi.Builder = Serializer.moshiBuilder
okClient: OkHttpClient? = null
) : this(baseUrl, okHttpClientBuilder, serializerBuilder) {
this.okHttpClient = okClient
}

init {
normalizeBaseUrl()
Expand Down Expand Up @@ -171,7 +182,9 @@ class ApiClient(
}

fun <S> createService(serviceClass: Class<S>): S {
return retrofitBuilder.client(clientBuilder.build()).build().create(serviceClass)
var usedClient: OkHttpClient? = null
this.okHttpClient?.let { usedClient = it } ?: run {usedClient = clientBuilder.build()}
return retrofitBuilder.client(usedClient).build().create(serviceClass)
}

private fun normalizeBaseUrl() {
Expand Down