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
64 changed files with 128 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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()
}