Skip to content

Commit 7a7c8c1

Browse files
vicmosinvicmosin
authored
[Kotlin][okhttp] replace okhttpclient with callfactory (#19422)
1 parent 0f294a5 commit 7a7c8c1

66 files changed

Lines changed: 111 additions & 111 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/api.mustache‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
package {{apiPackage}}
33

44
import java.io.IOException
5-
import okhttp3.OkHttpClient
5+
import okhttp3.Call
66
import okhttp3.HttpUrl
77

88
{{#imports}}import {{import}}
@@ -48,7 +48,7 @@ import {{packageName}}.infrastructure.Success
4848
import {{packageName}}.infrastructure.toMultiValue
4949

5050
{{#operations}}
51-
{{#nonPublicApi}}internal {{/nonPublicApi}}class {{classname}}(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath, client) {
51+
{{#nonPublicApi}}internal {{/nonPublicApi}}class {{classname}}(basePath: kotlin.String = defaultBasePath, client: Call.Factory = ApiClient.defaultClient) : ApiClient(basePath, client) {
5252
companion object {
5353
@JvmStatic
5454
val defaultBasePath: String by lazy {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ import com.squareup.moshi.adapter
6060

6161
{{#nonPublicApi}}internal {{/nonPublicApi}}val EMPTY_REQUEST: RequestBody = ByteArray(0).toRequestBody()
6262

63-
{{#nonPublicApi}}internal {{/nonPublicApi}}open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClient) {
63+
{{#nonPublicApi}}internal {{/nonPublicApi}}open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClient) {
6464
{{#nonPublicApi}}internal {{/nonPublicApi}}companion object {
6565
protected const val ContentType = "Content-Type"
6666
protected const val Accept = "Accept"

‎samples/client/others/kotlin-jvm-okhttp-parameter-tests/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package org.openapitools.client.apis
1717

1818
import java.io.IOException
19-
import okhttp3.OkHttpClient
19+
import okhttp3.Call
2020
import okhttp3.HttpUrl
2121

2222

@@ -36,7 +36,7 @@ import org.openapitools.client.infrastructure.ResponseType
3636
import org.openapitools.client.infrastructure.Success
3737
import org.openapitools.client.infrastructure.toMultiValue
3838

39-
class DefaultApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath, client) {
39+
class DefaultApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory = ApiClient.defaultClient) : ApiClient(basePath, client) {
4040
companion object {
4141
@JvmStatic
4242
val defaultBasePath: String by lazy {

‎samples/client/others/kotlin-jvm-okhttp-parameter-tests/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import com.squareup.moshi.adapter
3131

3232
val EMPTY_REQUEST: RequestBody = ByteArray(0).toRequestBody()
3333

34-
open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClient) {
34+
open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClient) {
3535
companion object {
3636
protected const val ContentType = "Content-Type"
3737
protected const val Accept = "Accept"

‎samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/apis/BirdApi.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package org.openapitools.client.apis
1717

1818
import java.io.IOException
19-
import okhttp3.OkHttpClient
19+
import okhttp3.Call
2020
import okhttp3.HttpUrl
2121

2222
import org.openapitools.client.models.Bird
@@ -37,7 +37,7 @@ import org.openapitools.client.infrastructure.ResponseType
3737
import org.openapitools.client.infrastructure.Success
3838
import org.openapitools.client.infrastructure.toMultiValue
3939

40-
class BirdApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath, client) {
40+
class BirdApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory = ApiClient.defaultClient) : ApiClient(basePath, client) {
4141
companion object {
4242
@JvmStatic
4343
val defaultBasePath: String by lazy {

‎samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import com.squareup.moshi.adapter
3131

3232
val EMPTY_REQUEST: RequestBody = ByteArray(0).toRequestBody()
3333

34-
open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClient) {
34+
open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClient) {
3535
companion object {
3636
protected const val ContentType = "Content-Type"
3737
protected const val Accept = "Accept"

‎samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package org.openapitools.client.apis
1717

1818
import java.io.IOException
19-
import okhttp3.OkHttpClient
19+
import okhttp3.Call
2020
import okhttp3.HttpUrl
2121

2222

@@ -36,7 +36,7 @@ import org.openapitools.client.infrastructure.ResponseType
3636
import org.openapitools.client.infrastructure.Success
3737
import org.openapitools.client.infrastructure.toMultiValue
3838

39-
class DefaultApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath, client) {
39+
class DefaultApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory = ApiClient.defaultClient) : ApiClient(basePath, client) {
4040
companion object {
4141
@JvmStatic
4242
val defaultBasePath: String by lazy {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import com.squareup.moshi.adapter
3131

3232
val EMPTY_REQUEST: RequestBody = ByteArray(0).toRequestBody()
3333

34-
open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClient) {
34+
open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClient) {
3535
companion object {
3636
protected const val ContentType = "Content-Type"
3737
protected const val Accept = "Accept"

‎samples/client/petstore/kotlin-bigdecimal-default-okhttp4/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package org.openapitools.client.apis
1717

1818
import java.io.IOException
19-
import okhttp3.OkHttpClient
19+
import okhttp3.Call
2020
import okhttp3.HttpUrl
2121

2222
import org.openapitools.client.models.Apa
@@ -37,7 +37,7 @@ import org.openapitools.client.infrastructure.ResponseType
3737
import org.openapitools.client.infrastructure.Success
3838
import org.openapitools.client.infrastructure.toMultiValue
3939

40-
class DefaultApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath, client) {
40+
class DefaultApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory = ApiClient.defaultClient) : ApiClient(basePath, client) {
4141
companion object {
4242
@JvmStatic
4343
val defaultBasePath: String by lazy {

‎samples/client/petstore/kotlin-bigdecimal-default-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import com.squareup.moshi.adapter
3131

3232
val EMPTY_REQUEST: RequestBody = ByteArray(0).toRequestBody()
3333

34-
open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClient) {
34+
open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClient) {
3535
companion object {
3636
protected const val ContentType = "Content-Type"
3737
protected const val Accept = "Accept"

0 commit comments

Comments
 (0)