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

OkHttpClient - replacing static client usage with client Injection #12444 (#12448)

Browse Source 
Co-authored-by: Grigory Tihonov <grigory.tihonov@lamoda.ru>
This commit is contained in:
CodeR 2022-05-24 16:51:47 +04:00 committed by GitHub
parent de8decc9f5
commit 73b0762f36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
64 changed files with 128 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/api.mustache vendored
View File

@ -2,6 +2,7 @@
package {{apiPackage}}
import java.io.IOException
import okhttp3.OkHttpClient
{{#imports}}import {{import}}
{{/imports}}
@ -46,7 +47,7 @@ import {{packageName}}.infrastructure.Success
import {{packageName}}.infrastructure.toMultiValue
{{#operations}}
{{#nonPublicApi}}internal {{/nonPublicApi}}class {{classname}}(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
{{#nonPublicApi}}internal {{/nonPublicApi}}class {{classname}}(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

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

@ -77,7 +77,7 @@ import com.fasterxml.jackson.core.type.TypeReference
import com.squareup.moshi.adapter
{{/moshi}}
{{#nonPublicApi}}internal {{/nonPublicApi}}open class ApiClient(val baseUrl: String) {
{{#nonPublicApi}}internal {{/nonPublicApi}}open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClient) {
{{#nonPublicApi}}internal {{/nonPublicApi}}companion object {
protected const val ContentType = "Content-Type"
protected const val Accept = "Accept"
@ -95,7 +95,7 @@ import com.squareup.moshi.adapter
const val baseUrlKey = "{{packageName}}.baseUrl"
@JvmStatic
val client: OkHttpClient by lazy {
val defaultClient: OkHttpClient by lazy {
builder.build()
}

3
samples/client/petstore/kotlin-array-simple-string-jvm-okhttp3/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
View File

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import com.squareup.moshi.Json
@ -39,7 +40,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
class DefaultApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
class DefaultApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

4
samples/client/petstore/kotlin-array-simple-string-jvm-okhttp3/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
View File

@ -26,7 +26,7 @@ import java.time.OffsetTime
import java.util.Locale
import com.squareup.moshi.adapter
open class ApiClient(val baseUrl: String) {
open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClient) {
companion object {
protected const val ContentType = "Content-Type"
protected const val Accept = "Accept"
@ -44,7 +44,7 @@ open class ApiClient(val baseUrl: String) {
const val baseUrlKey = "org.openapitools.client.baseUrl"
@JvmStatic
val client: OkHttpClient by lazy {
val defaultClient: OkHttpClient by lazy {
builder.build()
}

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

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import com.squareup.moshi.Json
@ -39,7 +40,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
class DefaultApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
class DefaultApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

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

@ -29,7 +29,7 @@ import java.time.OffsetTime
import java.util.Locale
import com.squareup.moshi.adapter
open class ApiClient(val baseUrl: String) {
open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClient) {
companion object {
protected const val ContentType = "Content-Type"
protected const val Accept = "Accept"
@ -47,7 +47,7 @@ open class ApiClient(val baseUrl: String) {
const val baseUrlKey = "org.openapitools.client.baseUrl"
@JvmStatic
val client: OkHttpClient by lazy {
val defaultClient: OkHttpClient by lazy {
builder.build()
}

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

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import org.openapitools.client.models.Apa
@ -40,7 +41,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
class DefaultApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
class DefaultApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

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

@ -29,7 +29,7 @@ import java.time.OffsetTime
import java.util.Locale
import com.squareup.moshi.adapter
open class ApiClient(val baseUrl: String) {
open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClient) {
companion object {
protected const val ContentType = "Content-Type"
protected const val Accept = "Accept"
@ -47,7 +47,7 @@ open class ApiClient(val baseUrl: String) {
const val baseUrlKey = "org.openapitools.client.baseUrl"
@JvmStatic
val client: OkHttpClient by lazy {
val defaultClient: OkHttpClient by lazy {
builder.build()
}

3
samples/client/petstore/kotlin-default-values-jvm-okhttp3/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
View File

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import com.squareup.moshi.Json
@ -39,7 +40,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
class DefaultApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
class DefaultApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

4
samples/client/petstore/kotlin-default-values-jvm-okhttp3/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
View File

@ -26,7 +26,7 @@ import java.time.OffsetTime
import java.util.Locale
import com.squareup.moshi.adapter
open class ApiClient(val baseUrl: String) {
open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClient) {
companion object {
protected const val ContentType = "Content-Type"
protected const val Accept = "Accept"
@ -44,7 +44,7 @@ open class ApiClient(val baseUrl: String) {
const val baseUrlKey = "org.openapitools.client.baseUrl"
@JvmStatic
val client: OkHttpClient by lazy {
val defaultClient: OkHttpClient by lazy {
builder.build()
}

3
samples/client/petstore/kotlin-default-values-jvm-okhttp4/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
View File

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import com.squareup.moshi.Json
@ -39,7 +40,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
class DefaultApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
class DefaultApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

4
samples/client/petstore/kotlin-default-values-jvm-okhttp4/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
View File

@ -29,7 +29,7 @@ import java.time.OffsetTime
import java.util.Locale
import com.squareup.moshi.adapter
open class ApiClient(val baseUrl: String) {
open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClient) {
companion object {
protected const val ContentType = "Content-Type"
protected const val Accept = "Accept"
@ -47,7 +47,7 @@ open class ApiClient(val baseUrl: String) {
const val baseUrlKey = "org.openapitools.client.baseUrl"
@JvmStatic
val client: OkHttpClient by lazy {
val defaultClient: OkHttpClient by lazy {
builder.build()
}

3
samples/client/petstore/kotlin-enum-default-value/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
View File

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import org.openapitools.client.models.ModelWithEnumPropertyHavingDefault
@ -40,7 +41,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
class DefaultApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
class DefaultApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

4
samples/client/petstore/kotlin-enum-default-value/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
View File

@ -29,7 +29,7 @@ import java.time.OffsetTime
import java.util.Locale
import com.squareup.moshi.adapter
open class ApiClient(val baseUrl: String) {
open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClient) {
companion object {
protected const val ContentType = "Content-Type"
protected const val Accept = "Accept"
@ -47,7 +47,7 @@ open class ApiClient(val baseUrl: String) {
const val baseUrlKey = "org.openapitools.client.baseUrl"
@JvmStatic
val client: OkHttpClient by lazy {
val defaultClient: OkHttpClient by lazy {
builder.build()
}

3
samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
View File

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import org.openapitools.client.models.ModelApiResponse
import org.openapitools.client.models.Pet
@ -41,7 +42,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
class PetApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

3
samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
View File

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import org.openapitools.client.models.Order
@ -40,7 +41,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
class StoreApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

3
samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
View File

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import org.openapitools.client.models.User
@ -40,7 +41,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
class UserApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

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

@ -29,7 +29,7 @@ import java.time.OffsetTime
import java.util.Locale
import com.google.gson.reflect.TypeToken
open class ApiClient(val baseUrl: String) {
open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClient) {
companion object {
protected const val ContentType = "Content-Type"
protected const val Accept = "Accept"
@ -47,7 +47,7 @@ open class ApiClient(val baseUrl: String) {
const val baseUrlKey = "org.openapitools.client.baseUrl"
@JvmStatic
val client: OkHttpClient by lazy {
val defaultClient: OkHttpClient by lazy {
builder.build()
}

3
samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
View File

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import org.openapitools.client.models.ModelApiResponse
import org.openapitools.client.models.Pet
@ -41,7 +42,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
class PetApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

3
samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
View File

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import org.openapitools.client.models.Order
@ -40,7 +41,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
class StoreApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

3
samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
View File

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import org.openapitools.client.models.User
@ -40,7 +41,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
class UserApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

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

@ -29,7 +29,7 @@ import java.time.OffsetTime
import java.util.Locale
import com.fasterxml.jackson.core.type.TypeReference
open class ApiClient(val baseUrl: String) {
open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClient) {
companion object {
protected const val ContentType = "Content-Type"
protected const val Accept = "Accept"
@ -47,7 +47,7 @@ open class ApiClient(val baseUrl: String) {
const val baseUrlKey = "org.openapitools.client.baseUrl"
@JvmStatic
val client: OkHttpClient by lazy {
val defaultClient: OkHttpClient by lazy {
builder.build()
}

3
samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
View File

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import org.openapitools.client.models.ModelApiResponse
import org.openapitools.client.models.Pet
@ -41,7 +42,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
class PetApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

3
samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
View File

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import org.openapitools.client.models.Order
@ -40,7 +41,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
class StoreApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

3
samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
View File

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import org.openapitools.client.models.User
@ -40,7 +41,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
class UserApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

4
samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
View File

@ -30,7 +30,7 @@ import java.time.OffsetTime
import java.util.Locale
import com.squareup.moshi.adapter
open class ApiClient(val baseUrl: String) {
open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClient) {
companion object {
protected const val ContentType = "Content-Type"
protected const val Accept = "Accept"
@ -48,7 +48,7 @@ open class ApiClient(val baseUrl: String) {
const val baseUrlKey = "org.openapitools.client.baseUrl"
@JvmStatic
val client: OkHttpClient by lazy {
val defaultClient: OkHttpClient by lazy {
builder.build()
}

3
samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
View File

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import org.openapitools.client.models.ModelApiResponse
import org.openapitools.client.models.Pet
@ -43,7 +44,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
class PetApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

3
samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
View File

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import org.openapitools.client.models.Order
@ -42,7 +43,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
class StoreApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

3
samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
View File

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import org.openapitools.client.models.User
@ -42,7 +43,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
class UserApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

4
samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
View File

@ -32,7 +32,7 @@ import kotlin.coroutines.resumeWithException
import kotlinx.coroutines.suspendCancellableCoroutine
import com.google.gson.reflect.TypeToken
open class ApiClient(val baseUrl: String) {
open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClient) {
companion object {
protected const val ContentType = "Content-Type"
protected const val Accept = "Accept"
@ -50,7 +50,7 @@ open class ApiClient(val baseUrl: String) {
const val baseUrlKey = "org.openapitools.client.baseUrl"
@JvmStatic
val client: OkHttpClient by lazy {
val defaultClient: OkHttpClient by lazy {
builder.build()
}

3
samples/client/petstore/kotlin-modelMutable/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
View File

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import org.openapitools.client.models.ModelApiResponse
import org.openapitools.client.models.Pet
@ -41,7 +42,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
class PetApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

3
samples/client/petstore/kotlin-modelMutable/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
View File

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import org.openapitools.client.models.Order
@ -40,7 +41,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
class StoreApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

3
samples/client/petstore/kotlin-modelMutable/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
View File

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import org.openapitools.client.models.User
@ -40,7 +41,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
class UserApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

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

@ -29,7 +29,7 @@ import java.time.OffsetTime
import java.util.Locale
import com.squareup.moshi.adapter
open class ApiClient(val baseUrl: String) {
open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClient) {
companion object {
protected const val ContentType = "Content-Type"
protected const val Accept = "Accept"
@ -47,7 +47,7 @@ open class ApiClient(val baseUrl: String) {
const val baseUrlKey = "org.openapitools.client.baseUrl"
@JvmStatic
val client: OkHttpClient by lazy {
val defaultClient: OkHttpClient by lazy {
builder.build()
}

3
samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
View File

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import org.openapitools.client.models.ModelApiResponse
import org.openapitools.client.models.Pet
@ -41,7 +42,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
class PetApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

3
samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
View File

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import org.openapitools.client.models.Order
@ -40,7 +41,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
class StoreApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

3
samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
View File

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import org.openapitools.client.models.User
@ -40,7 +41,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
class UserApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

4
samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
View File

@ -29,7 +29,7 @@ import java.time.OffsetTime
import java.util.Locale
import com.squareup.moshi.adapter
open class ApiClient(val baseUrl: String) {
open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClient) {
companion object {
protected const val ContentType = "Content-Type"
protected const val Accept = "Accept"
@ -47,7 +47,7 @@ open class ApiClient(val baseUrl: String) {
const val baseUrlKey = "org.openapitools.client.baseUrl"
@JvmStatic
val client: OkHttpClient by lazy {
val defaultClient: OkHttpClient by lazy {
builder.build()
}

3
samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
View File

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import org.openapitools.client.models.ModelApiResponse
import org.openapitools.client.models.Pet
@ -41,7 +42,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
internal class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
internal class PetApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

3
samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
View File

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import org.openapitools.client.models.Order
@ -40,7 +41,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
internal class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
internal class StoreApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

3
samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
View File

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import org.openapitools.client.models.User
@ -40,7 +41,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
internal class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
internal class UserApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

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

@ -29,7 +29,7 @@ import java.time.OffsetTime
import java.util.Locale
import com.squareup.moshi.adapter
internal open class ApiClient(val baseUrl: String) {
internal open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClient) {
internal companion object {
protected const val ContentType = "Content-Type"
protected const val Accept = "Accept"
@ -47,7 +47,7 @@ internal open class ApiClient(val baseUrl: String) {
const val baseUrlKey = "org.openapitools.client.baseUrl"
@JvmStatic
val client: OkHttpClient by lazy {
val defaultClient: OkHttpClient by lazy {
builder.build()
}

3
samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
View File

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import org.openapitools.client.models.ModelApiResponse
import org.openapitools.client.models.Pet
@ -41,7 +42,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
class PetApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

3
samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
View File

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import org.openapitools.client.models.Order
@ -40,7 +41,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
class StoreApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

3
samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
View File

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import org.openapitools.client.models.User
@ -40,7 +41,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
class UserApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

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

@ -29,7 +29,7 @@ import java.time.OffsetTime
import java.util.Locale
import com.squareup.moshi.adapter
open class ApiClient(val baseUrl: String) {
open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClient) {
companion object {
protected const val ContentType = "Content-Type"
protected const val Accept = "Accept"
@ -47,7 +47,7 @@ open class ApiClient(val baseUrl: String) {
const val baseUrlKey = "org.openapitools.client.baseUrl"
@JvmStatic
val client: OkHttpClient by lazy {
val defaultClient: OkHttpClient by lazy {
builder.build()
}

3
samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
View File

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import org.openapitools.client.models.ModelApiResponse
import org.openapitools.client.models.Pet
@ -41,7 +42,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
class PetApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

3
samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
View File

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import org.openapitools.client.models.Order
@ -40,7 +41,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
class StoreApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

3
samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
View File

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import org.openapitools.client.models.User
@ -40,7 +41,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
class UserApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

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

@ -26,7 +26,7 @@ import java.time.OffsetTime
import java.util.Locale
import com.squareup.moshi.adapter
open class ApiClient(val baseUrl: String) {
open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClient) {
companion object {
protected const val ContentType = "Content-Type"
protected const val Accept = "Accept"
@ -44,7 +44,7 @@ open class ApiClient(val baseUrl: String) {
const val baseUrlKey = "org.openapitools.client.baseUrl"
@JvmStatic
val client: OkHttpClient by lazy {
val defaultClient: OkHttpClient by lazy {
builder.build()
}

3
samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
View File

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import org.openapitools.client.models.ModelApiResponse
import org.openapitools.client.models.Pet
@ -41,7 +42,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
class PetApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

3
samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
View File

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import org.openapitools.client.models.Order
@ -40,7 +41,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
class StoreApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

3
samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
View File

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import org.openapitools.client.models.User
@ -40,7 +41,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
class UserApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

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

@ -29,7 +29,7 @@ import java.time.OffsetTime
import java.util.Locale
import com.squareup.moshi.adapter
open class ApiClient(val baseUrl: String) {
open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClient) {
companion object {
protected const val ContentType = "Content-Type"
protected const val Accept = "Accept"
@ -47,7 +47,7 @@ open class ApiClient(val baseUrl: String) {
const val baseUrlKey = "org.openapitools.client.baseUrl"
@JvmStatic
val client: OkHttpClient by lazy {
val defaultClient: OkHttpClient by lazy {
builder.build()
}

3
samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
View File

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import org.openapitools.client.models.ModelApiResponse
import org.openapitools.client.models.Pet
@ -41,7 +42,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
class PetApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

3
samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
View File

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import org.openapitools.client.models.Order
@ -40,7 +41,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
class StoreApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

3
samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
View File

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import org.openapitools.client.models.User
@ -40,7 +41,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
class UserApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

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

@ -29,7 +29,7 @@ import org.threeten.bp.OffsetDateTime
import org.threeten.bp.OffsetTime
import com.squareup.moshi.adapter
open class ApiClient(val baseUrl: String) {
open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClient) {
companion object {
protected const val ContentType = "Content-Type"
protected const val Accept = "Accept"
@ -47,7 +47,7 @@ open class ApiClient(val baseUrl: String) {
const val baseUrlKey = "org.openapitools.client.baseUrl"
@JvmStatic
val client: OkHttpClient by lazy {
val defaultClient: OkHttpClient by lazy {
builder.build()
}

3
samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/apis/EnumApi.kt
View File

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import org.openapitools.client.models.PetEnum
@ -40,7 +41,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
class EnumApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
class EnumApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

4
samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
View File

@ -29,7 +29,7 @@ import java.time.OffsetTime
import java.util.Locale
import com.squareup.moshi.adapter
open class ApiClient(val baseUrl: String) {
open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClient) {
companion object {
protected const val ContentType = "Content-Type"
protected const val Accept = "Accept"
@ -47,7 +47,7 @@ open class ApiClient(val baseUrl: String) {
const val baseUrlKey = "org.openapitools.client.baseUrl"
@JvmStatic
val client: OkHttpClient by lazy {
val defaultClient: OkHttpClient by lazy {
builder.build()
}

3
samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
View File

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import org.openapitools.client.models.ModelApiResponse
import org.openapitools.client.models.Pet
@ -41,7 +42,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
class PetApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

3
samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
View File

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import org.openapitools.client.models.Order
@ -40,7 +41,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
class StoreApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

3
samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
View File

@ -21,6 +21,7 @@
package org.openapitools.client.apis
import java.io.IOException
import okhttp3.OkHttpClient
import org.openapitools.client.models.User
@ -40,7 +41,7 @@ import org.openapitools.client.infrastructure.ResponseType
import org.openapitools.client.infrastructure.Success
import org.openapitools.client.infrastructure.toMultiValue
class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
class UserApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath) {
companion object {
@JvmStatic
val defaultBasePath: String by lazy {

4
samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
View File

@ -29,7 +29,7 @@ import java.time.OffsetTime
import java.util.Locale
import com.squareup.moshi.adapter
open class ApiClient(val baseUrl: String) {
open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClient) {
companion object {
protected const val ContentType = "Content-Type"
protected const val Accept = "Accept"
@ -47,7 +47,7 @@ open class ApiClient(val baseUrl: String) {
const val baseUrlKey = "org.openapitools.client.baseUrl"
@JvmStatic
val client: OkHttpClient by lazy {
val defaultClient: OkHttpClient by lazy {
builder.build()
}