From 8e16efa4902cd9fcc1e180a6c27d42ef0e814c2b Mon Sep 17 00:00:00 2001 From: Bruno Coelho <4brunu@gmail.com> Date: Wed, 26 Feb 2020 08:29:06 +0000 Subject: [PATCH 1/5] [kotlin][client] make base path configurable --- .../codegen/languages/KotlinClientCodegen.java | 5 +++-- .../kotlin-client/Configuration.kt.mustache | 8 ++++++++ .../main/resources/kotlin-client/api.mustache | 3 ++- .../infrastructure/ApiClient.kt.mustache | 2 +- .../libraries/multiplatform/api.mustache | 4 ++-- .../org/openapitools/client/apis/PetApi.kt | 3 ++- .../org/openapitools/client/apis/StoreApi.kt | 3 ++- .../org/openapitools/client/apis/UserApi.kt | 3 ++- .../client/infrastructure/Configuration.kt | 18 ++++++++++++++++++ .../org/openapitools/client/apis/PetApi.kt | 3 ++- .../org/openapitools/client/apis/StoreApi.kt | 3 ++- .../org/openapitools/client/apis/UserApi.kt | 3 ++- .../client/infrastructure/Configuration.kt | 18 ++++++++++++++++++ .../org/openapitools/client/apis/PetApi.kt | 3 ++- .../org/openapitools/client/apis/StoreApi.kt | 3 ++- .../org/openapitools/client/apis/UserApi.kt | 3 ++- .../client/infrastructure/Configuration.kt | 18 ++++++++++++++++++ .../org/openapitools/client/apis/PetApi.kt | 4 ++-- .../org/openapitools/client/apis/StoreApi.kt | 4 ++-- .../org/openapitools/client/apis/UserApi.kt | 4 ++-- .../client/infrastructure/Configuration.kt | 18 ++++++++++++++++++ .../org/openapitools/client/apis/PetApi.kt | 3 ++- .../org/openapitools/client/apis/StoreApi.kt | 3 ++- .../org/openapitools/client/apis/UserApi.kt | 3 ++- .../client/infrastructure/Configuration.kt | 18 ++++++++++++++++++ .../org/openapitools/client/apis/PetApi.kt | 3 ++- .../org/openapitools/client/apis/StoreApi.kt | 3 ++- .../org/openapitools/client/apis/UserApi.kt | 3 ++- .../client/infrastructure/Configuration.kt | 18 ++++++++++++++++++ .../org/openapitools/client/apis/PetApi.kt | 3 ++- .../org/openapitools/client/apis/StoreApi.kt | 3 ++- .../org/openapitools/client/apis/UserApi.kt | 3 ++- .../client/infrastructure/Configuration.kt | 18 ++++++++++++++++++ .../client/infrastructure/ApiClient.kt | 2 +- .../client/infrastructure/Configuration.kt | 18 ++++++++++++++++++ .../org/openapitools/client/apis/PetApi.kt | 3 ++- .../org/openapitools/client/apis/StoreApi.kt | 3 ++- .../org/openapitools/client/apis/UserApi.kt | 3 ++- .../client/infrastructure/Configuration.kt | 18 ++++++++++++++++++ .../org/openapitools/client/apis/PetApi.kt | 3 ++- .../org/openapitools/client/apis/StoreApi.kt | 3 ++- .../org/openapitools/client/apis/UserApi.kt | 3 ++- .../client/infrastructure/Configuration.kt | 18 ++++++++++++++++++ .../org/openapitools/client/apis/PetApi.kt | 3 ++- .../org/openapitools/client/apis/StoreApi.kt | 3 ++- .../org/openapitools/client/apis/UserApi.kt | 3 ++- .../client/infrastructure/Configuration.kt | 18 ++++++++++++++++++ 47 files changed, 275 insertions(+), 40 deletions(-) create mode 100644 modules/openapi-generator/src/main/resources/kotlin-client/Configuration.kt.mustache create mode 100644 samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt create mode 100644 samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt create mode 100644 samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt create mode 100644 samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/infrastructure/Configuration.kt create mode 100644 samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt create mode 100644 samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt create mode 100644 samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt create mode 100644 samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt create mode 100644 samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt create mode 100644 samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt create mode 100644 samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java index ae8409c4a2dc..02e1fb3dced1 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java @@ -223,7 +223,7 @@ public void processOpts() { setRequestDateConverter(additionalProperties.get(REQUEST_DATE_CONVERTER).toString()); } - commonSupportingFiles(); + commonSupportingFiles(infrastructureFolder); switch (getLibrary()) { case JVM_OKHTTP3: @@ -427,10 +427,11 @@ private void commonJvmMultiplatformSupportingFiles(String infrastructureFolder) supportingFiles.add(new SupportingFile("infrastructure/RequestMethod.kt.mustache", infrastructureFolder, "RequestMethod.kt")); } - private void commonSupportingFiles() { + private void commonSupportingFiles(String infrastructureFolder) { supportingFiles.add(new SupportingFile("README.mustache", "", "README.md")); supportingFiles.add(new SupportingFile("build.gradle.mustache", "", "build.gradle")); supportingFiles.add(new SupportingFile("settings.gradle.mustache", "", "settings.gradle")); + supportingFiles.add(new SupportingFile("Configuration.kt.mustache", infrastructureFolder, "Configuration.kt")); } @Override diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/Configuration.kt.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/Configuration.kt.mustache new file mode 100644 index 000000000000..ee4cbfe07e03 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-client/Configuration.kt.mustache @@ -0,0 +1,8 @@ +{{>licenseInfo}} +package {{packageName}}.infrastructure + +{{#nonPublicApi}}internal {{/nonPublicApi}}object Configuration { + + var basePath = "{{{basePath}}}" + +} diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/api.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/api.mustache index 20070e1b86b5..5df90f20cd75 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/api.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/api.mustache @@ -7,6 +7,7 @@ package {{apiPackage}} import {{packageName}}.infrastructure.ApiClient import {{packageName}}.infrastructure.ClientException import {{packageName}}.infrastructure.ClientError +import {{packageName}}.infrastructure.Configuration import {{packageName}}.infrastructure.ServerException import {{packageName}}.infrastructure.ServerError import {{packageName}}.infrastructure.MultiValueMap @@ -17,7 +18,7 @@ import {{packageName}}.infrastructure.Success import {{packageName}}.infrastructure.toMultiValue {{#operations}} -{{#nonPublicApi}}internal {{/nonPublicApi}}class {{classname}}(basePath: kotlin.String = "{{{basePath}}}") : ApiClient(basePath) { +{{#nonPublicApi}}internal {{/nonPublicApi}}class {{classname}}(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { {{#operation}} /** diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/infrastructure/ApiClient.kt.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/infrastructure/ApiClient.kt.mustache index eab46f77ad48..1de0b9b7e7b7 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/infrastructure/ApiClient.kt.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/infrastructure/ApiClient.kt.mustache @@ -11,7 +11,7 @@ import retrofit2.converter.moshi.MoshiConverterFactory {{/moshi}} {{#nonPublicApi}}internal {{/nonPublicApi}}class ApiClient( - private var baseUrl: String = "{{{basePath}}}", + private var baseUrl: String = Configuration.basePath, private var okHttpClient: OkHttpClient ) { init { diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/api.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/api.mustache index aac93219b677..15b658dc41e5 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/api.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/api.mustache @@ -17,14 +17,14 @@ import kotlinx.serialization.internal.StringDescriptor {{#operations}} {{#nonPublicApi}}internal {{/nonPublicApi}}class {{classname}} @UseExperimental(UnstableDefault::class) constructor( - baseUrl: kotlin.String = "{{{basePath}}}", + baseUrl: kotlin.String = Configuration.basePath, httpClientEngine: HttpClientEngine? = null, serializer: KotlinxSerializer) : ApiClient(baseUrl, httpClientEngine, serializer) { @UseExperimental(UnstableDefault::class) constructor( - baseUrl: kotlin.String = "{{{basePath}}}", + baseUrl: kotlin.String = Configuration.basePath, httpClientEngine: HttpClientEngine? = null, jsonConfiguration: JsonConfiguration = JsonConfiguration.Default) : this(baseUrl, httpClientEngine, KotlinxSerializer(Json(jsonConfiguration))) diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 2e3b24ae2eab..461487d662ea 100644 --- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -17,6 +17,7 @@ import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError +import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -26,7 +27,7 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class PetApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiClient(basePath) { +class PetApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { /** * Add a new pet to the store diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt index 1399a0ca1cf7..2755f3fdccc8 100644 --- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -16,6 +16,7 @@ import org.openapitools.client.models.Order import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError +import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -25,7 +26,7 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class StoreApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiClient(basePath) { +class StoreApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { /** * Delete purchase order by ID diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index a7d99762fd8c..b650a88853e2 100644 --- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -16,6 +16,7 @@ import org.openapitools.client.models.User import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError +import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -25,7 +26,7 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiClient(basePath) { +class UserApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { /** * Create user diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt new file mode 100644 index 000000000000..f8a1305111f5 --- /dev/null +++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt @@ -0,0 +1,18 @@ +/** +* OpenAPI Petstore +* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. +* +* The version of the OpenAPI document: 1.0.0 +* +* +* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). +* https://openapi-generator.tech +* Do not edit the class manually. +*/ +package org.openapitools.client.infrastructure + +object Configuration { + + var basePath = "http://petstore.swagger.io/v2" + +} diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 97248ed4cfdc..1a7b6ff8bb70 100644 --- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -17,6 +17,7 @@ import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError +import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -26,7 +27,7 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class PetApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiClient(basePath) { +class PetApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { /** * Add a new pet to the store diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt index 1399a0ca1cf7..2755f3fdccc8 100644 --- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -16,6 +16,7 @@ import org.openapitools.client.models.Order import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError +import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -25,7 +26,7 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class StoreApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiClient(basePath) { +class StoreApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { /** * Delete purchase order by ID diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index a7d99762fd8c..b650a88853e2 100644 --- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -16,6 +16,7 @@ import org.openapitools.client.models.User import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError +import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -25,7 +26,7 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiClient(basePath) { +class UserApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { /** * Create user diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt new file mode 100644 index 000000000000..f8a1305111f5 --- /dev/null +++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt @@ -0,0 +1,18 @@ +/** +* OpenAPI Petstore +* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. +* +* The version of the OpenAPI document: 1.0.0 +* +* +* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). +* https://openapi-generator.tech +* Do not edit the class manually. +*/ +package org.openapitools.client.infrastructure + +object Configuration { + + var basePath = "http://petstore.swagger.io/v2" + +} diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 2e3b24ae2eab..461487d662ea 100644 --- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -17,6 +17,7 @@ import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError +import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -26,7 +27,7 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class PetApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiClient(basePath) { +class PetApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { /** * Add a new pet to the store diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt index 1399a0ca1cf7..2755f3fdccc8 100644 --- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -16,6 +16,7 @@ import org.openapitools.client.models.Order import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError +import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -25,7 +26,7 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class StoreApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiClient(basePath) { +class StoreApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { /** * Delete purchase order by ID diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index a7d99762fd8c..b650a88853e2 100644 --- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -16,6 +16,7 @@ import org.openapitools.client.models.User import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError +import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -25,7 +26,7 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiClient(basePath) { +class UserApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { /** * Create user diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt new file mode 100644 index 000000000000..f8a1305111f5 --- /dev/null +++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt @@ -0,0 +1,18 @@ +/** +* OpenAPI Petstore +* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. +* +* The version of the OpenAPI document: 1.0.0 +* +* +* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). +* https://openapi-generator.tech +* Do not edit the class manually. +*/ +package org.openapitools.client.infrastructure + +object Configuration { + + var basePath = "http://petstore.swagger.io/v2" + +} diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt index aa9c34a0dca6..728d1fa6ea2c 100644 --- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt @@ -26,14 +26,14 @@ import kotlinx.serialization.* import kotlinx.serialization.internal.StringDescriptor class PetApi @UseExperimental(UnstableDefault::class) constructor( - baseUrl: kotlin.String = "http://petstore.swagger.io/v2", + baseUrl: kotlin.String = Configuration.basePath, httpClientEngine: HttpClientEngine? = null, serializer: KotlinxSerializer) : ApiClient(baseUrl, httpClientEngine, serializer) { @UseExperimental(UnstableDefault::class) constructor( - baseUrl: kotlin.String = "http://petstore.swagger.io/v2", + baseUrl: kotlin.String = Configuration.basePath, httpClientEngine: HttpClientEngine? = null, jsonConfiguration: JsonConfiguration = JsonConfiguration.Default) : this(baseUrl, httpClientEngine, KotlinxSerializer(Json(jsonConfiguration))) diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt index 56a581d3725a..43673351c833 100644 --- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -25,14 +25,14 @@ import kotlinx.serialization.* import kotlinx.serialization.internal.StringDescriptor class StoreApi @UseExperimental(UnstableDefault::class) constructor( - baseUrl: kotlin.String = "http://petstore.swagger.io/v2", + baseUrl: kotlin.String = Configuration.basePath, httpClientEngine: HttpClientEngine? = null, serializer: KotlinxSerializer) : ApiClient(baseUrl, httpClientEngine, serializer) { @UseExperimental(UnstableDefault::class) constructor( - baseUrl: kotlin.String = "http://petstore.swagger.io/v2", + baseUrl: kotlin.String = Configuration.basePath, httpClientEngine: HttpClientEngine? = null, jsonConfiguration: JsonConfiguration = JsonConfiguration.Default) : this(baseUrl, httpClientEngine, KotlinxSerializer(Json(jsonConfiguration))) diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt index 6786d3d3f331..869f0ba1106f 100644 --- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt @@ -25,14 +25,14 @@ import kotlinx.serialization.* import kotlinx.serialization.internal.StringDescriptor class UserApi @UseExperimental(UnstableDefault::class) constructor( - baseUrl: kotlin.String = "http://petstore.swagger.io/v2", + baseUrl: kotlin.String = Configuration.basePath, httpClientEngine: HttpClientEngine? = null, serializer: KotlinxSerializer) : ApiClient(baseUrl, httpClientEngine, serializer) { @UseExperimental(UnstableDefault::class) constructor( - baseUrl: kotlin.String = "http://petstore.swagger.io/v2", + baseUrl: kotlin.String = Configuration.basePath, httpClientEngine: HttpClientEngine? = null, jsonConfiguration: JsonConfiguration = JsonConfiguration.Default) : this(baseUrl, httpClientEngine, KotlinxSerializer(Json(jsonConfiguration))) diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/infrastructure/Configuration.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/infrastructure/Configuration.kt new file mode 100644 index 000000000000..f8a1305111f5 --- /dev/null +++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/infrastructure/Configuration.kt @@ -0,0 +1,18 @@ +/** +* OpenAPI Petstore +* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. +* +* The version of the OpenAPI document: 1.0.0 +* +* +* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). +* https://openapi-generator.tech +* Do not edit the class manually. +*/ +package org.openapitools.client.infrastructure + +object Configuration { + + var basePath = "http://petstore.swagger.io/v2" + +} diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 51247617d9cf..e57fa55ab730 100644 --- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -17,6 +17,7 @@ import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError +import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -26,7 +27,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 = "http://petstore.swagger.io/v2") : ApiClient(basePath) { +internal class PetApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { /** * Add a new pet to the store diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt index 893601a3220a..ec681d32bdd4 100644 --- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -16,6 +16,7 @@ import org.openapitools.client.models.Order import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError +import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -25,7 +26,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 = "http://petstore.swagger.io/v2") : ApiClient(basePath) { +internal class StoreApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { /** * Delete purchase order by ID diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index d486ee7dc52b..37805de0cbe9 100644 --- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -16,6 +16,7 @@ import org.openapitools.client.models.User import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError +import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -25,7 +26,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 = "http://petstore.swagger.io/v2") : ApiClient(basePath) { +internal class UserApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { /** * Create user diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt new file mode 100644 index 000000000000..35953e7155d6 --- /dev/null +++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt @@ -0,0 +1,18 @@ +/** +* OpenAPI Petstore +* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. +* +* The version of the OpenAPI document: 1.0.0 +* +* +* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). +* https://openapi-generator.tech +* Do not edit the class manually. +*/ +package org.openapitools.client.infrastructure + +internal object Configuration { + + var basePath = "http://petstore.swagger.io/v2" + +} diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index de4ab6dbb83e..b12a863d061a 100644 --- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -17,6 +17,7 @@ import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError +import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -26,7 +27,7 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class PetApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiClient(basePath) { +class PetApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { /** * Add a new pet to the store diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt index a2deaaa89d1d..4f9ca0356ede 100644 --- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -16,6 +16,7 @@ import org.openapitools.client.models.Order import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError +import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -25,7 +26,7 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class StoreApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiClient(basePath) { +class StoreApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { /** * Delete purchase order by ID diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index d4f2f9f8c249..95b619947e61 100644 --- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -16,6 +16,7 @@ import org.openapitools.client.models.User import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError +import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -25,7 +26,7 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiClient(basePath) { +class UserApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { /** * Create user diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt new file mode 100644 index 000000000000..f8a1305111f5 --- /dev/null +++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt @@ -0,0 +1,18 @@ +/** +* OpenAPI Petstore +* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. +* +* The version of the OpenAPI document: 1.0.0 +* +* +* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). +* https://openapi-generator.tech +* Do not edit the class manually. +*/ +package org.openapitools.client.infrastructure + +object Configuration { + + var basePath = "http://petstore.swagger.io/v2" + +} diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 2e3b24ae2eab..461487d662ea 100644 --- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -17,6 +17,7 @@ import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError +import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -26,7 +27,7 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class PetApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiClient(basePath) { +class PetApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { /** * Add a new pet to the store diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt index 1399a0ca1cf7..2755f3fdccc8 100644 --- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -16,6 +16,7 @@ import org.openapitools.client.models.Order import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError +import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -25,7 +26,7 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class StoreApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiClient(basePath) { +class StoreApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { /** * Delete purchase order by ID diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index a7d99762fd8c..b650a88853e2 100644 --- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -16,6 +16,7 @@ import org.openapitools.client.models.User import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError +import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -25,7 +26,7 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiClient(basePath) { +class UserApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { /** * Create user diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt new file mode 100644 index 000000000000..f8a1305111f5 --- /dev/null +++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt @@ -0,0 +1,18 @@ +/** +* OpenAPI Petstore +* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. +* +* The version of the OpenAPI document: 1.0.0 +* +* +* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). +* https://openapi-generator.tech +* Do not edit the class manually. +*/ +package org.openapitools.client.infrastructure + +object Configuration { + + var basePath = "http://petstore.swagger.io/v2" + +} diff --git a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index b539fda7438d..77f51d655347 100644 --- a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -6,7 +6,7 @@ import retrofit2.converter.scalars.ScalarsConverterFactory import retrofit2.converter.moshi.MoshiConverterFactory class ApiClient( - private var baseUrl: String = "http://petstore.swagger.io/v2", + private var baseUrl: String = Configuration.basePath, private var okHttpClient: OkHttpClient ) { init { diff --git a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt new file mode 100644 index 000000000000..f8a1305111f5 --- /dev/null +++ b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt @@ -0,0 +1,18 @@ +/** +* OpenAPI Petstore +* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. +* +* The version of the OpenAPI document: 1.0.0 +* +* +* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). +* https://openapi-generator.tech +* Do not edit the class manually. +*/ +package org.openapitools.client.infrastructure + +object Configuration { + + var basePath = "http://petstore.swagger.io/v2" + +} diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 69d1e725e495..865178b4d024 100644 --- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -17,6 +17,7 @@ import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError +import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -26,7 +27,7 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class PetApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiClient(basePath) { +class PetApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { /** * Add a new pet to the store diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt index 1399a0ca1cf7..2755f3fdccc8 100644 --- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -16,6 +16,7 @@ import org.openapitools.client.models.Order import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError +import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -25,7 +26,7 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class StoreApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiClient(basePath) { +class StoreApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { /** * Delete purchase order by ID diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index a7d99762fd8c..b650a88853e2 100644 --- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -16,6 +16,7 @@ import org.openapitools.client.models.User import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError +import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -25,7 +26,7 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiClient(basePath) { +class UserApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { /** * Create user diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt new file mode 100644 index 000000000000..f8a1305111f5 --- /dev/null +++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt @@ -0,0 +1,18 @@ +/** +* OpenAPI Petstore +* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. +* +* The version of the OpenAPI document: 1.0.0 +* +* +* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). +* https://openapi-generator.tech +* Do not edit the class manually. +*/ +package org.openapitools.client.infrastructure + +object Configuration { + + var basePath = "http://petstore.swagger.io/v2" + +} diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 2e3b24ae2eab..461487d662ea 100644 --- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -17,6 +17,7 @@ import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError +import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -26,7 +27,7 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class PetApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiClient(basePath) { +class PetApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { /** * Add a new pet to the store diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt index 1399a0ca1cf7..2755f3fdccc8 100644 --- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -16,6 +16,7 @@ import org.openapitools.client.models.Order import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError +import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -25,7 +26,7 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class StoreApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiClient(basePath) { +class StoreApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { /** * Delete purchase order by ID diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index a7d99762fd8c..b650a88853e2 100644 --- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -16,6 +16,7 @@ import org.openapitools.client.models.User import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError +import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -25,7 +26,7 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiClient(basePath) { +class UserApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { /** * Create user diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt new file mode 100644 index 000000000000..f8a1305111f5 --- /dev/null +++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt @@ -0,0 +1,18 @@ +/** +* OpenAPI Petstore +* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. +* +* The version of the OpenAPI document: 1.0.0 +* +* +* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). +* https://openapi-generator.tech +* Do not edit the class manually. +*/ +package org.openapitools.client.infrastructure + +object Configuration { + + var basePath = "http://petstore.swagger.io/v2" + +} diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 2e3b24ae2eab..461487d662ea 100644 --- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -17,6 +17,7 @@ import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError +import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -26,7 +27,7 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class PetApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiClient(basePath) { +class PetApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { /** * Add a new pet to the store diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt index 1399a0ca1cf7..2755f3fdccc8 100644 --- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -16,6 +16,7 @@ import org.openapitools.client.models.Order import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError +import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -25,7 +26,7 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class StoreApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiClient(basePath) { +class StoreApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { /** * Delete purchase order by ID diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index a7d99762fd8c..b650a88853e2 100644 --- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -16,6 +16,7 @@ import org.openapitools.client.models.User import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError +import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -25,7 +26,7 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiClient(basePath) { +class UserApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { /** * Create user diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt new file mode 100644 index 000000000000..f8a1305111f5 --- /dev/null +++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt @@ -0,0 +1,18 @@ +/** +* OpenAPI Petstore +* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. +* +* The version of the OpenAPI document: 1.0.0 +* +* +* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). +* https://openapi-generator.tech +* Do not edit the class manually. +*/ +package org.openapitools.client.infrastructure + +object Configuration { + + var basePath = "http://petstore.swagger.io/v2" + +} From 7ac55436b5e4108a30f6c10b872841a3151da9d3 Mon Sep 17 00:00:00 2001 From: Bruno Coelho <4brunu@gmail.com> Date: Thu, 27 Feb 2020 10:21:55 +0000 Subject: [PATCH 2/5] [kotlin][client] update pet project --- .../org/openapitools/client/apis/PetApi.kt | 3 ++- .../org/openapitools/client/apis/StoreApi.kt | 3 ++- .../org/openapitools/client/apis/UserApi.kt | 3 ++- .../client/infrastructure/Configuration.kt | 18 ++++++++++++++++++ 4 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 2e3b24ae2eab..461487d662ea 100644 --- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -17,6 +17,7 @@ import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError +import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -26,7 +27,7 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class PetApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiClient(basePath) { +class PetApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { /** * Add a new pet to the store diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt index 1399a0ca1cf7..2755f3fdccc8 100644 --- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -16,6 +16,7 @@ import org.openapitools.client.models.Order import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError +import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -25,7 +26,7 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class StoreApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiClient(basePath) { +class StoreApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { /** * Delete purchase order by ID diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index a7d99762fd8c..b650a88853e2 100644 --- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -16,6 +16,7 @@ import org.openapitools.client.models.User import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError +import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -25,7 +26,7 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiClient(basePath) { +class UserApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { /** * Create user diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt new file mode 100644 index 000000000000..f8a1305111f5 --- /dev/null +++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt @@ -0,0 +1,18 @@ +/** +* OpenAPI Petstore +* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. +* +* The version of the OpenAPI document: 1.0.0 +* +* +* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). +* https://openapi-generator.tech +* Do not edit the class manually. +*/ +package org.openapitools.client.infrastructure + +object Configuration { + + var basePath = "http://petstore.swagger.io/v2" + +} From c7bbad745c26604fd7ab7d4d2707a8095d201ac4 Mon Sep 17 00:00:00 2001 From: Bruno Coelho <4brunu@gmail.com> Date: Tue, 17 Mar 2020 11:00:35 +0000 Subject: [PATCH 3/5] [kotlin][client] set default base path --- .../codegen/languages/KotlinClientCodegen.java | 5 ++--- .../kotlin-client/Configuration.kt.mustache | 8 -------- .../main/resources/kotlin-client/api.mustache | 9 +++++++-- .../infrastructure/ApiClient.kt.mustache | 9 ++++++++- .../libraries/multiplatform/api.mustache | 2 +- .../org/openapitools/client/apis/PetApi.kt | 9 +++++++-- .../org/openapitools/client/apis/StoreApi.kt | 9 +++++++-- .../org/openapitools/client/apis/UserApi.kt | 9 +++++++-- .../client/infrastructure/Configuration.kt | 18 ------------------ .../org/openapitools/client/apis/PetApi.kt | 9 +++++++-- .../org/openapitools/client/apis/StoreApi.kt | 9 +++++++-- .../org/openapitools/client/apis/UserApi.kt | 9 +++++++-- .../client/infrastructure/Configuration.kt | 18 ------------------ .../org/openapitools/client/apis/PetApi.kt | 9 +++++++-- .../org/openapitools/client/apis/StoreApi.kt | 9 +++++++-- .../org/openapitools/client/apis/UserApi.kt | 9 +++++++-- .../client/infrastructure/Configuration.kt | 18 ------------------ .../org/openapitools/client/apis/PetApi.kt | 9 +++++++-- .../org/openapitools/client/apis/StoreApi.kt | 9 +++++++-- .../org/openapitools/client/apis/UserApi.kt | 9 +++++++-- .../client/infrastructure/Configuration.kt | 18 ------------------ .../org/openapitools/client/apis/PetApi.kt | 2 +- .../org/openapitools/client/apis/StoreApi.kt | 2 +- .../org/openapitools/client/apis/UserApi.kt | 2 +- .../client/infrastructure/Configuration.kt | 18 ------------------ .../org/openapitools/client/apis/PetApi.kt | 9 +++++++-- .../org/openapitools/client/apis/StoreApi.kt | 9 +++++++-- .../org/openapitools/client/apis/UserApi.kt | 9 +++++++-- .../client/infrastructure/Configuration.kt | 18 ------------------ .../org/openapitools/client/apis/PetApi.kt | 9 +++++++-- .../org/openapitools/client/apis/StoreApi.kt | 9 +++++++-- .../org/openapitools/client/apis/UserApi.kt | 9 +++++++-- .../client/infrastructure/Configuration.kt | 18 ------------------ .../org/openapitools/client/apis/PetApi.kt | 9 +++++++-- .../org/openapitools/client/apis/StoreApi.kt | 9 +++++++-- .../org/openapitools/client/apis/UserApi.kt | 9 +++++++-- .../client/infrastructure/Configuration.kt | 18 ------------------ .../client/infrastructure/ApiClient.kt | 9 ++++++++- .../client/infrastructure/Configuration.kt | 18 ------------------ .../org/openapitools/client/apis/PetApi.kt | 9 +++++++-- .../org/openapitools/client/apis/StoreApi.kt | 9 +++++++-- .../org/openapitools/client/apis/UserApi.kt | 9 +++++++-- .../client/infrastructure/Configuration.kt | 18 ------------------ .../org/openapitools/client/apis/PetApi.kt | 9 +++++++-- .../org/openapitools/client/apis/StoreApi.kt | 9 +++++++-- .../org/openapitools/client/apis/UserApi.kt | 9 +++++++-- .../client/infrastructure/Configuration.kt | 18 ------------------ .../org/openapitools/client/apis/PetApi.kt | 9 +++++++-- .../org/openapitools/client/apis/StoreApi.kt | 9 +++++++-- .../org/openapitools/client/apis/UserApi.kt | 9 +++++++-- .../client/infrastructure/Configuration.kt | 18 ------------------ 51 files changed, 239 insertions(+), 295 deletions(-) delete mode 100644 modules/openapi-generator/src/main/resources/kotlin-client/Configuration.kt.mustache delete mode 100644 samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt delete mode 100644 samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt delete mode 100644 samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt delete mode 100644 samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt delete mode 100644 samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/infrastructure/Configuration.kt delete mode 100644 samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt delete mode 100644 samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt delete mode 100644 samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt delete mode 100644 samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt delete mode 100644 samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt delete mode 100644 samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt delete mode 100644 samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java index e8c870fafaaf..15ed281c16d7 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java @@ -223,7 +223,7 @@ public void processOpts() { setRequestDateConverter(additionalProperties.get(REQUEST_DATE_CONVERTER).toString()); } - commonSupportingFiles(infrastructureFolder); + commonSupportingFiles(); switch (getLibrary()) { case JVM_OKHTTP3: @@ -435,11 +435,10 @@ private void commonJvmMultiplatformSupportingFiles(String infrastructureFolder) supportingFiles.add(new SupportingFile("infrastructure/RequestMethod.kt.mustache", infrastructureFolder, "RequestMethod.kt")); } - private void commonSupportingFiles(String infrastructureFolder) { + private void commonSupportingFiles() { supportingFiles.add(new SupportingFile("README.mustache", "", "README.md")); supportingFiles.add(new SupportingFile("build.gradle.mustache", "", "build.gradle")); supportingFiles.add(new SupportingFile("settings.gradle.mustache", "", "settings.gradle")); - supportingFiles.add(new SupportingFile("Configuration.kt.mustache", infrastructureFolder, "Configuration.kt")); } @Override diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/Configuration.kt.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/Configuration.kt.mustache deleted file mode 100644 index ee4cbfe07e03..000000000000 --- a/modules/openapi-generator/src/main/resources/kotlin-client/Configuration.kt.mustache +++ /dev/null @@ -1,8 +0,0 @@ -{{>licenseInfo}} -package {{packageName}}.infrastructure - -{{#nonPublicApi}}internal {{/nonPublicApi}}object Configuration { - - var basePath = "{{{basePath}}}" - -} diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/api.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/api.mustache index 5df90f20cd75..eeb7545e0f02 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/api.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/api.mustache @@ -7,7 +7,6 @@ package {{apiPackage}} import {{packageName}}.infrastructure.ApiClient import {{packageName}}.infrastructure.ClientException import {{packageName}}.infrastructure.ClientError -import {{packageName}}.infrastructure.Configuration import {{packageName}}.infrastructure.ServerException import {{packageName}}.infrastructure.ServerError import {{packageName}}.infrastructure.MultiValueMap @@ -18,7 +17,13 @@ import {{packageName}}.infrastructure.Success import {{packageName}}.infrastructure.toMultiValue {{#operations}} -{{#nonPublicApi}}internal {{/nonPublicApi}}class {{classname}}(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { +{{#nonPublicApi}}internal {{/nonPublicApi}}class {{classname}}(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { + companion object { + @JvmStatic + val defaultBasePath: String by lazy { + System.getProperties().getProperty("{{projectName}}.server.baseUrl", "{{{basePath}}}") + } + } {{#operation}} /** diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/infrastructure/ApiClient.kt.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/infrastructure/ApiClient.kt.mustache index 1de0b9b7e7b7..958722052c68 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/infrastructure/ApiClient.kt.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/infrastructure/ApiClient.kt.mustache @@ -11,9 +11,16 @@ import retrofit2.converter.moshi.MoshiConverterFactory {{/moshi}} {{#nonPublicApi}}internal {{/nonPublicApi}}class ApiClient( - private var baseUrl: String = Configuration.basePath, + private var baseUrl: String = defaultBasePath, private var okHttpClient: OkHttpClient ) { + companion object { + @JvmStatic + val defaultBasePath: String by lazy { + System.getProperties().getProperty("{{projectName}}.server.baseUrl", "{{{basePath}}}") + } + } + init { normalizeBaseUrl() } diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/api.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/api.mustache index 15b658dc41e5..d030ae595133 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/api.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/api.mustache @@ -17,7 +17,7 @@ import kotlinx.serialization.internal.StringDescriptor {{#operations}} {{#nonPublicApi}}internal {{/nonPublicApi}}class {{classname}} @UseExperimental(UnstableDefault::class) constructor( - baseUrl: kotlin.String = Configuration.basePath, + baseUrl: kotlin.String = "{{{basePath}}}", httpClientEngine: HttpClientEngine? = null, serializer: KotlinxSerializer) : ApiClient(baseUrl, httpClientEngine, serializer) { diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 461487d662ea..4bfdcd959789 100644 --- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -17,7 +17,6 @@ import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError -import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -27,7 +26,13 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class PetApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { +class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { + companion object { + @JvmStatic + val defaultBasePath: String by lazy { + System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + } + } /** * Add a new pet to the store diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt index 2755f3fdccc8..dc1e1e572079 100644 --- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -16,7 +16,6 @@ import org.openapitools.client.models.Order import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError -import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -26,7 +25,13 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class StoreApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { +class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { + companion object { + @JvmStatic + val defaultBasePath: String by lazy { + System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + } + } /** * Delete purchase order by ID diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index b650a88853e2..85674f108549 100644 --- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -16,7 +16,6 @@ import org.openapitools.client.models.User import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError -import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -26,7 +25,13 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class UserApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { +class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { + companion object { + @JvmStatic + val defaultBasePath: String by lazy { + System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + } + } /** * Create user diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt deleted file mode 100644 index f8a1305111f5..000000000000 --- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt +++ /dev/null @@ -1,18 +0,0 @@ -/** -* OpenAPI Petstore -* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. -* -* The version of the OpenAPI document: 1.0.0 -* -* -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). -* https://openapi-generator.tech -* Do not edit the class manually. -*/ -package org.openapitools.client.infrastructure - -object Configuration { - - var basePath = "http://petstore.swagger.io/v2" - -} diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 461487d662ea..4bfdcd959789 100644 --- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -17,7 +17,6 @@ import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError -import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -27,7 +26,13 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class PetApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { +class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { + companion object { + @JvmStatic + val defaultBasePath: String by lazy { + System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + } + } /** * Add a new pet to the store diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt index 2755f3fdccc8..dc1e1e572079 100644 --- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -16,7 +16,6 @@ import org.openapitools.client.models.Order import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError -import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -26,7 +25,13 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class StoreApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { +class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { + companion object { + @JvmStatic + val defaultBasePath: String by lazy { + System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + } + } /** * Delete purchase order by ID diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index b650a88853e2..85674f108549 100644 --- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -16,7 +16,6 @@ import org.openapitools.client.models.User import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError -import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -26,7 +25,13 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class UserApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { +class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { + companion object { + @JvmStatic + val defaultBasePath: String by lazy { + System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + } + } /** * Create user diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt deleted file mode 100644 index f8a1305111f5..000000000000 --- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt +++ /dev/null @@ -1,18 +0,0 @@ -/** -* OpenAPI Petstore -* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. -* -* The version of the OpenAPI document: 1.0.0 -* -* -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). -* https://openapi-generator.tech -* Do not edit the class manually. -*/ -package org.openapitools.client.infrastructure - -object Configuration { - - var basePath = "http://petstore.swagger.io/v2" - -} diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 1a7b6ff8bb70..e06f8efc188f 100644 --- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -17,7 +17,6 @@ import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError -import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -27,7 +26,13 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class PetApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { +class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { + companion object { + @JvmStatic + val defaultBasePath: String by lazy { + System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + } + } /** * Add a new pet to the store diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt index 2755f3fdccc8..dc1e1e572079 100644 --- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -16,7 +16,6 @@ import org.openapitools.client.models.Order import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError -import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -26,7 +25,13 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class StoreApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { +class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { + companion object { + @JvmStatic + val defaultBasePath: String by lazy { + System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + } + } /** * Delete purchase order by ID diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index b650a88853e2..85674f108549 100644 --- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -16,7 +16,6 @@ import org.openapitools.client.models.User import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError -import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -26,7 +25,13 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class UserApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { +class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { + companion object { + @JvmStatic + val defaultBasePath: String by lazy { + System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + } + } /** * Create user diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt deleted file mode 100644 index f8a1305111f5..000000000000 --- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt +++ /dev/null @@ -1,18 +0,0 @@ -/** -* OpenAPI Petstore -* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. -* -* The version of the OpenAPI document: 1.0.0 -* -* -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). -* https://openapi-generator.tech -* Do not edit the class manually. -*/ -package org.openapitools.client.infrastructure - -object Configuration { - - var basePath = "http://petstore.swagger.io/v2" - -} diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 461487d662ea..4bfdcd959789 100644 --- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -17,7 +17,6 @@ import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError -import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -27,7 +26,13 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class PetApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { +class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { + companion object { + @JvmStatic + val defaultBasePath: String by lazy { + System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + } + } /** * Add a new pet to the store diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt index 2755f3fdccc8..dc1e1e572079 100644 --- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -16,7 +16,6 @@ import org.openapitools.client.models.Order import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError -import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -26,7 +25,13 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class StoreApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { +class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { + companion object { + @JvmStatic + val defaultBasePath: String by lazy { + System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + } + } /** * Delete purchase order by ID diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index b650a88853e2..85674f108549 100644 --- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -16,7 +16,6 @@ import org.openapitools.client.models.User import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError -import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -26,7 +25,13 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class UserApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { +class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { + companion object { + @JvmStatic + val defaultBasePath: String by lazy { + System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + } + } /** * Create user diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt deleted file mode 100644 index f8a1305111f5..000000000000 --- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt +++ /dev/null @@ -1,18 +0,0 @@ -/** -* OpenAPI Petstore -* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. -* -* The version of the OpenAPI document: 1.0.0 -* -* -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). -* https://openapi-generator.tech -* Do not edit the class manually. -*/ -package org.openapitools.client.infrastructure - -object Configuration { - - var basePath = "http://petstore.swagger.io/v2" - -} diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt index 728d1fa6ea2c..bae85a401ee9 100644 --- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt @@ -26,7 +26,7 @@ import kotlinx.serialization.* import kotlinx.serialization.internal.StringDescriptor class PetApi @UseExperimental(UnstableDefault::class) constructor( - baseUrl: kotlin.String = Configuration.basePath, + baseUrl: kotlin.String = "http://petstore.swagger.io/v2", httpClientEngine: HttpClientEngine? = null, serializer: KotlinxSerializer) : ApiClient(baseUrl, httpClientEngine, serializer) { diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt index 43673351c833..7df91be9a4c0 100644 --- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -25,7 +25,7 @@ import kotlinx.serialization.* import kotlinx.serialization.internal.StringDescriptor class StoreApi @UseExperimental(UnstableDefault::class) constructor( - baseUrl: kotlin.String = Configuration.basePath, + baseUrl: kotlin.String = "http://petstore.swagger.io/v2", httpClientEngine: HttpClientEngine? = null, serializer: KotlinxSerializer) : ApiClient(baseUrl, httpClientEngine, serializer) { diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt index 869f0ba1106f..72206762bafc 100644 --- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt @@ -25,7 +25,7 @@ import kotlinx.serialization.* import kotlinx.serialization.internal.StringDescriptor class UserApi @UseExperimental(UnstableDefault::class) constructor( - baseUrl: kotlin.String = Configuration.basePath, + baseUrl: kotlin.String = "http://petstore.swagger.io/v2", httpClientEngine: HttpClientEngine? = null, serializer: KotlinxSerializer) : ApiClient(baseUrl, httpClientEngine, serializer) { diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/infrastructure/Configuration.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/infrastructure/Configuration.kt deleted file mode 100644 index f8a1305111f5..000000000000 --- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/infrastructure/Configuration.kt +++ /dev/null @@ -1,18 +0,0 @@ -/** -* OpenAPI Petstore -* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. -* -* The version of the OpenAPI document: 1.0.0 -* -* -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). -* https://openapi-generator.tech -* Do not edit the class manually. -*/ -package org.openapitools.client.infrastructure - -object Configuration { - - var basePath = "http://petstore.swagger.io/v2" - -} diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index e57fa55ab730..61d08b5dc19d 100644 --- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -17,7 +17,6 @@ import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError -import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -27,7 +26,13 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -internal class PetApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { +internal class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { + companion object { + @JvmStatic + val defaultBasePath: String by lazy { + System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + } + } /** * Add a new pet to the store diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt index ec681d32bdd4..f6b1c8954edc 100644 --- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -16,7 +16,6 @@ import org.openapitools.client.models.Order import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError -import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -26,7 +25,13 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -internal class StoreApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { +internal class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { + companion object { + @JvmStatic + val defaultBasePath: String by lazy { + System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + } + } /** * Delete purchase order by ID diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index 37805de0cbe9..9a65043170ba 100644 --- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -16,7 +16,6 @@ import org.openapitools.client.models.User import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError -import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -26,7 +25,13 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -internal class UserApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { +internal class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { + companion object { + @JvmStatic + val defaultBasePath: String by lazy { + System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + } + } /** * Create user diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt deleted file mode 100644 index 35953e7155d6..000000000000 --- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt +++ /dev/null @@ -1,18 +0,0 @@ -/** -* OpenAPI Petstore -* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. -* -* The version of the OpenAPI document: 1.0.0 -* -* -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). -* https://openapi-generator.tech -* Do not edit the class manually. -*/ -package org.openapitools.client.infrastructure - -internal object Configuration { - - var basePath = "http://petstore.swagger.io/v2" - -} diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index b12a863d061a..61bb7d277686 100644 --- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -17,7 +17,6 @@ import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError -import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -27,7 +26,13 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class PetApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { +class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { + companion object { + @JvmStatic + val defaultBasePath: String by lazy { + System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + } + } /** * Add a new pet to the store diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt index 4f9ca0356ede..9ce233bb78df 100644 --- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -16,7 +16,6 @@ import org.openapitools.client.models.Order import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError -import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -26,7 +25,13 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class StoreApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { +class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { + companion object { + @JvmStatic + val defaultBasePath: String by lazy { + System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + } + } /** * Delete purchase order by ID diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index 95b619947e61..5420bce80932 100644 --- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -16,7 +16,6 @@ import org.openapitools.client.models.User import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError -import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -26,7 +25,13 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class UserApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { +class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { + companion object { + @JvmStatic + val defaultBasePath: String by lazy { + System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + } + } /** * Create user diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt deleted file mode 100644 index f8a1305111f5..000000000000 --- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt +++ /dev/null @@ -1,18 +0,0 @@ -/** -* OpenAPI Petstore -* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. -* -* The version of the OpenAPI document: 1.0.0 -* -* -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). -* https://openapi-generator.tech -* Do not edit the class manually. -*/ -package org.openapitools.client.infrastructure - -object Configuration { - - var basePath = "http://petstore.swagger.io/v2" - -} diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 461487d662ea..4bfdcd959789 100644 --- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -17,7 +17,6 @@ import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError -import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -27,7 +26,13 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class PetApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { +class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { + companion object { + @JvmStatic + val defaultBasePath: String by lazy { + System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + } + } /** * Add a new pet to the store diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt index 2755f3fdccc8..dc1e1e572079 100644 --- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -16,7 +16,6 @@ import org.openapitools.client.models.Order import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError -import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -26,7 +25,13 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class StoreApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { +class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { + companion object { + @JvmStatic + val defaultBasePath: String by lazy { + System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + } + } /** * Delete purchase order by ID diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index b650a88853e2..85674f108549 100644 --- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -16,7 +16,6 @@ import org.openapitools.client.models.User import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError -import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -26,7 +25,13 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class UserApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { +class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { + companion object { + @JvmStatic + val defaultBasePath: String by lazy { + System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + } + } /** * Create user diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt deleted file mode 100644 index f8a1305111f5..000000000000 --- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt +++ /dev/null @@ -1,18 +0,0 @@ -/** -* OpenAPI Petstore -* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. -* -* The version of the OpenAPI document: 1.0.0 -* -* -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). -* https://openapi-generator.tech -* Do not edit the class manually. -*/ -package org.openapitools.client.infrastructure - -object Configuration { - - var basePath = "http://petstore.swagger.io/v2" - -} diff --git a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 77f51d655347..ff03d7fa4cc7 100644 --- a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -6,9 +6,16 @@ import retrofit2.converter.scalars.ScalarsConverterFactory import retrofit2.converter.moshi.MoshiConverterFactory class ApiClient( - private var baseUrl: String = Configuration.basePath, + private var baseUrl: String = defaultBasePath, private var okHttpClient: OkHttpClient ) { + companion object { + @JvmStatic + val defaultBasePath: String by lazy { + System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + } + } + init { normalizeBaseUrl() } diff --git a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt deleted file mode 100644 index f8a1305111f5..000000000000 --- a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt +++ /dev/null @@ -1,18 +0,0 @@ -/** -* OpenAPI Petstore -* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. -* -* The version of the OpenAPI document: 1.0.0 -* -* -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). -* https://openapi-generator.tech -* Do not edit the class manually. -*/ -package org.openapitools.client.infrastructure - -object Configuration { - - var basePath = "http://petstore.swagger.io/v2" - -} diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 865178b4d024..3c0904cbbc40 100644 --- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -17,7 +17,6 @@ import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError -import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -27,7 +26,13 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class PetApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { +class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { + companion object { + @JvmStatic + val defaultBasePath: String by lazy { + System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + } + } /** * Add a new pet to the store diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt index 2755f3fdccc8..dc1e1e572079 100644 --- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -16,7 +16,6 @@ import org.openapitools.client.models.Order import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError -import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -26,7 +25,13 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class StoreApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { +class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { + companion object { + @JvmStatic + val defaultBasePath: String by lazy { + System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + } + } /** * Delete purchase order by ID diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index b650a88853e2..85674f108549 100644 --- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -16,7 +16,6 @@ import org.openapitools.client.models.User import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError -import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -26,7 +25,13 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class UserApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { +class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { + companion object { + @JvmStatic + val defaultBasePath: String by lazy { + System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + } + } /** * Create user diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt deleted file mode 100644 index f8a1305111f5..000000000000 --- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt +++ /dev/null @@ -1,18 +0,0 @@ -/** -* OpenAPI Petstore -* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. -* -* The version of the OpenAPI document: 1.0.0 -* -* -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). -* https://openapi-generator.tech -* Do not edit the class manually. -*/ -package org.openapitools.client.infrastructure - -object Configuration { - - var basePath = "http://petstore.swagger.io/v2" - -} diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 461487d662ea..4bfdcd959789 100644 --- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -17,7 +17,6 @@ import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError -import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -27,7 +26,13 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class PetApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { +class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { + companion object { + @JvmStatic + val defaultBasePath: String by lazy { + System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + } + } /** * Add a new pet to the store diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt index 2755f3fdccc8..dc1e1e572079 100644 --- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -16,7 +16,6 @@ import org.openapitools.client.models.Order import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError -import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -26,7 +25,13 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class StoreApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { +class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { + companion object { + @JvmStatic + val defaultBasePath: String by lazy { + System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + } + } /** * Delete purchase order by ID diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index b650a88853e2..85674f108549 100644 --- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -16,7 +16,6 @@ import org.openapitools.client.models.User import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError -import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -26,7 +25,13 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class UserApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { +class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { + companion object { + @JvmStatic + val defaultBasePath: String by lazy { + System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + } + } /** * Create user diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt deleted file mode 100644 index f8a1305111f5..000000000000 --- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt +++ /dev/null @@ -1,18 +0,0 @@ -/** -* OpenAPI Petstore -* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. -* -* The version of the OpenAPI document: 1.0.0 -* -* -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). -* https://openapi-generator.tech -* Do not edit the class manually. -*/ -package org.openapitools.client.infrastructure - -object Configuration { - - var basePath = "http://petstore.swagger.io/v2" - -} diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 461487d662ea..4bfdcd959789 100644 --- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -17,7 +17,6 @@ import org.openapitools.client.models.Pet import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError -import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -27,7 +26,13 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class PetApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { +class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { + companion object { + @JvmStatic + val defaultBasePath: String by lazy { + System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + } + } /** * Add a new pet to the store diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt index 2755f3fdccc8..dc1e1e572079 100644 --- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -16,7 +16,6 @@ import org.openapitools.client.models.Order import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError -import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -26,7 +25,13 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class StoreApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { +class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { + companion object { + @JvmStatic + val defaultBasePath: String by lazy { + System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + } + } /** * Delete purchase order by ID diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index b650a88853e2..85674f108549 100644 --- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -16,7 +16,6 @@ import org.openapitools.client.models.User import org.openapitools.client.infrastructure.ApiClient import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.infrastructure.ClientError -import org.openapitools.client.infrastructure.Configuration import org.openapitools.client.infrastructure.ServerException import org.openapitools.client.infrastructure.ServerError import org.openapitools.client.infrastructure.MultiValueMap @@ -26,7 +25,13 @@ import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -class UserApi(basePath: kotlin.String = Configuration.basePath) : ApiClient(basePath) { +class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { + companion object { + @JvmStatic + val defaultBasePath: String by lazy { + System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + } + } /** * Create user diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt deleted file mode 100644 index f8a1305111f5..000000000000 --- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/Configuration.kt +++ /dev/null @@ -1,18 +0,0 @@ -/** -* OpenAPI Petstore -* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. -* -* The version of the OpenAPI document: 1.0.0 -* -* -* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). -* https://openapi-generator.tech -* Do not edit the class manually. -*/ -package org.openapitools.client.infrastructure - -object Configuration { - - var basePath = "http://petstore.swagger.io/v2" - -} From 8bfffb697eb82466ba840a9af84c5ed224b86ebf Mon Sep 17 00:00:00 2001 From: Bruno Coelho <4brunu@gmail.com> Date: Tue, 17 Mar 2020 11:05:38 +0000 Subject: [PATCH 4/5] [kotlin][client] set default base path --- .../kotlin-client/libraries/multiplatform/api.mustache | 2 +- .../commonMain/kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt | 2 +- .../commonMain/kotlin/org/openapitools/client/apis/UserApi.kt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/api.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/api.mustache index d030ae595133..aac93219b677 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/api.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/api.mustache @@ -24,7 +24,7 @@ import kotlinx.serialization.internal.StringDescriptor @UseExperimental(UnstableDefault::class) constructor( - baseUrl: kotlin.String = Configuration.basePath, + baseUrl: kotlin.String = "{{{basePath}}}", httpClientEngine: HttpClientEngine? = null, jsonConfiguration: JsonConfiguration = JsonConfiguration.Default) : this(baseUrl, httpClientEngine, KotlinxSerializer(Json(jsonConfiguration))) diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt index bae85a401ee9..aa9c34a0dca6 100644 --- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt @@ -33,7 +33,7 @@ class PetApi @UseExperimental(UnstableDefault::class) constructor( @UseExperimental(UnstableDefault::class) constructor( - baseUrl: kotlin.String = Configuration.basePath, + baseUrl: kotlin.String = "http://petstore.swagger.io/v2", httpClientEngine: HttpClientEngine? = null, jsonConfiguration: JsonConfiguration = JsonConfiguration.Default) : this(baseUrl, httpClientEngine, KotlinxSerializer(Json(jsonConfiguration))) diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt index 7df91be9a4c0..56a581d3725a 100644 --- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -32,7 +32,7 @@ class StoreApi @UseExperimental(UnstableDefault::class) constructor( @UseExperimental(UnstableDefault::class) constructor( - baseUrl: kotlin.String = Configuration.basePath, + baseUrl: kotlin.String = "http://petstore.swagger.io/v2", httpClientEngine: HttpClientEngine? = null, jsonConfiguration: JsonConfiguration = JsonConfiguration.Default) : this(baseUrl, httpClientEngine, KotlinxSerializer(Json(jsonConfiguration))) diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt index 72206762bafc..6786d3d3f331 100644 --- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt @@ -32,7 +32,7 @@ class UserApi @UseExperimental(UnstableDefault::class) constructor( @UseExperimental(UnstableDefault::class) constructor( - baseUrl: kotlin.String = Configuration.basePath, + baseUrl: kotlin.String = "http://petstore.swagger.io/v2", httpClientEngine: HttpClientEngine? = null, jsonConfiguration: JsonConfiguration = JsonConfiguration.Default) : this(baseUrl, httpClientEngine, KotlinxSerializer(Json(jsonConfiguration))) From 758ea41d2e2ac7bc6346b600ca1ab74ee7012b34 Mon Sep 17 00:00:00 2001 From: Bruno Coelho <4brunu@gmail.com> Date: Tue, 17 Mar 2020 11:24:05 +0000 Subject: [PATCH 5/5] [kotlin][client] set default base path --- .../src/main/resources/kotlin-client/api.mustache | 2 +- .../jvm-retrofit2/infrastructure/ApiClient.kt.mustache | 2 +- .../src/main/kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../src/main/kotlin/org/openapitools/client/apis/StoreApi.kt | 2 +- .../src/main/kotlin/org/openapitools/client/apis/UserApi.kt | 2 +- .../src/main/kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../src/main/kotlin/org/openapitools/client/apis/StoreApi.kt | 2 +- .../src/main/kotlin/org/openapitools/client/apis/UserApi.kt | 2 +- .../src/main/kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../src/main/kotlin/org/openapitools/client/apis/StoreApi.kt | 2 +- .../src/main/kotlin/org/openapitools/client/apis/UserApi.kt | 2 +- .../src/main/kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../src/main/kotlin/org/openapitools/client/apis/StoreApi.kt | 2 +- .../src/main/kotlin/org/openapitools/client/apis/UserApi.kt | 2 +- .../src/main/kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../src/main/kotlin/org/openapitools/client/apis/StoreApi.kt | 2 +- .../src/main/kotlin/org/openapitools/client/apis/UserApi.kt | 2 +- .../src/main/kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../src/main/kotlin/org/openapitools/client/apis/StoreApi.kt | 2 +- .../src/main/kotlin/org/openapitools/client/apis/UserApi.kt | 2 +- .../src/main/kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../src/main/kotlin/org/openapitools/client/apis/StoreApi.kt | 2 +- .../src/main/kotlin/org/openapitools/client/apis/UserApi.kt | 2 +- .../kotlin/org/openapitools/client/infrastructure/ApiClient.kt | 2 +- .../src/main/kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../src/main/kotlin/org/openapitools/client/apis/StoreApi.kt | 2 +- .../src/main/kotlin/org/openapitools/client/apis/UserApi.kt | 2 +- .../src/main/kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../src/main/kotlin/org/openapitools/client/apis/StoreApi.kt | 2 +- .../src/main/kotlin/org/openapitools/client/apis/UserApi.kt | 2 +- .../src/main/kotlin/org/openapitools/client/apis/PetApi.kt | 2 +- .../src/main/kotlin/org/openapitools/client/apis/StoreApi.kt | 2 +- .../src/main/kotlin/org/openapitools/client/apis/UserApi.kt | 2 +- 33 files changed, 33 insertions(+), 33 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/api.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/api.mustache index eeb7545e0f02..9580d8532eae 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/api.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/api.mustache @@ -21,7 +21,7 @@ import {{packageName}}.infrastructure.toMultiValue companion object { @JvmStatic val defaultBasePath: String by lazy { - System.getProperties().getProperty("{{projectName}}.server.baseUrl", "{{{basePath}}}") + System.getProperties().getProperty("{{packageName}}.baseUrl", "{{{basePath}}}") } } diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/infrastructure/ApiClient.kt.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/infrastructure/ApiClient.kt.mustache index 958722052c68..723be88b00a3 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/infrastructure/ApiClient.kt.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/infrastructure/ApiClient.kt.mustache @@ -17,7 +17,7 @@ import retrofit2.converter.moshi.MoshiConverterFactory companion object { @JvmStatic val defaultBasePath: String by lazy { - System.getProperties().getProperty("{{projectName}}.server.baseUrl", "{{{basePath}}}") + System.getProperties().getProperty("{{packageName}}.baseUrl", "{{{basePath}}}") } } diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 4bfdcd959789..66c6ea9871d5 100644 --- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -30,7 +30,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { companion object { @JvmStatic val defaultBasePath: String by lazy { - System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2") } } diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt index dc1e1e572079..08822c67e32a 100644 --- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -29,7 +29,7 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) companion object { @JvmStatic val defaultBasePath: String by lazy { - System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2") } } diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index 85674f108549..1e6e81fc1e91 100644 --- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -29,7 +29,7 @@ class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { companion object { @JvmStatic val defaultBasePath: String by lazy { - System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2") } } diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 4bfdcd959789..66c6ea9871d5 100644 --- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -30,7 +30,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { companion object { @JvmStatic val defaultBasePath: String by lazy { - System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2") } } diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt index dc1e1e572079..08822c67e32a 100644 --- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -29,7 +29,7 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) companion object { @JvmStatic val defaultBasePath: String by lazy { - System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2") } } diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index 85674f108549..1e6e81fc1e91 100644 --- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -29,7 +29,7 @@ class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { companion object { @JvmStatic val defaultBasePath: String by lazy { - System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2") } } diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index e06f8efc188f..5b552aa220b0 100644 --- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -30,7 +30,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { companion object { @JvmStatic val defaultBasePath: String by lazy { - System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2") } } diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt index dc1e1e572079..08822c67e32a 100644 --- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -29,7 +29,7 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) companion object { @JvmStatic val defaultBasePath: String by lazy { - System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2") } } diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index 85674f108549..1e6e81fc1e91 100644 --- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -29,7 +29,7 @@ class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { companion object { @JvmStatic val defaultBasePath: String by lazy { - System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2") } } diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 4bfdcd959789..66c6ea9871d5 100644 --- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -30,7 +30,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { companion object { @JvmStatic val defaultBasePath: String by lazy { - System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2") } } diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt index dc1e1e572079..08822c67e32a 100644 --- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -29,7 +29,7 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) companion object { @JvmStatic val defaultBasePath: String by lazy { - System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2") } } diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index 85674f108549..1e6e81fc1e91 100644 --- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -29,7 +29,7 @@ class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { companion object { @JvmStatic val defaultBasePath: String by lazy { - System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2") } } diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 61d08b5dc19d..69e974ed01ea 100644 --- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -30,7 +30,7 @@ internal class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(bas companion object { @JvmStatic val defaultBasePath: String by lazy { - System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2") } } diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt index f6b1c8954edc..4f8898adf9b3 100644 --- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -29,7 +29,7 @@ internal class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(b companion object { @JvmStatic val defaultBasePath: String by lazy { - System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2") } } diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index 9a65043170ba..eba7b8392e8d 100644 --- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -29,7 +29,7 @@ internal class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(ba companion object { @JvmStatic val defaultBasePath: String by lazy { - System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2") } } diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 61bb7d277686..05e02dd04f4f 100644 --- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -30,7 +30,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { companion object { @JvmStatic val defaultBasePath: String by lazy { - System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2") } } diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt index 9ce233bb78df..b9dd7b38f59b 100644 --- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -29,7 +29,7 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) companion object { @JvmStatic val defaultBasePath: String by lazy { - System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2") } } diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index 5420bce80932..14ce7aa5f54a 100644 --- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -29,7 +29,7 @@ class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { companion object { @JvmStatic val defaultBasePath: String by lazy { - System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2") } } diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 4bfdcd959789..66c6ea9871d5 100644 --- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -30,7 +30,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { companion object { @JvmStatic val defaultBasePath: String by lazy { - System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2") } } diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt index dc1e1e572079..08822c67e32a 100644 --- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -29,7 +29,7 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) companion object { @JvmStatic val defaultBasePath: String by lazy { - System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2") } } diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index 85674f108549..1e6e81fc1e91 100644 --- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -29,7 +29,7 @@ class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { companion object { @JvmStatic val defaultBasePath: String by lazy { - System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2") } } diff --git a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index ff03d7fa4cc7..2b657de46adb 100644 --- a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -12,7 +12,7 @@ class ApiClient( companion object { @JvmStatic val defaultBasePath: String by lazy { - System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2") } } diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 3c0904cbbc40..829c6dae827f 100644 --- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -30,7 +30,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { companion object { @JvmStatic val defaultBasePath: String by lazy { - System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2") } } diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt index dc1e1e572079..08822c67e32a 100644 --- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -29,7 +29,7 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) companion object { @JvmStatic val defaultBasePath: String by lazy { - System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2") } } diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index 85674f108549..1e6e81fc1e91 100644 --- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -29,7 +29,7 @@ class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { companion object { @JvmStatic val defaultBasePath: String by lazy { - System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2") } } diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 4bfdcd959789..66c6ea9871d5 100644 --- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -30,7 +30,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { companion object { @JvmStatic val defaultBasePath: String by lazy { - System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2") } } diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt index dc1e1e572079..08822c67e32a 100644 --- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -29,7 +29,7 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) companion object { @JvmStatic val defaultBasePath: String by lazy { - System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2") } } diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index 85674f108549..1e6e81fc1e91 100644 --- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -29,7 +29,7 @@ class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { companion object { @JvmStatic val defaultBasePath: String by lazy { - System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2") } } diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 4bfdcd959789..66c6ea9871d5 100644 --- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -30,7 +30,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { companion object { @JvmStatic val defaultBasePath: String by lazy { - System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2") } } diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt index dc1e1e572079..08822c67e32a 100644 --- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -29,7 +29,7 @@ class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) companion object { @JvmStatic val defaultBasePath: String by lazy { - System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2") } } diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index 85674f108549..1e6e81fc1e91 100644 --- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -29,7 +29,7 @@ class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) { companion object { @JvmStatic val defaultBasePath: String by lazy { - System.getProperties().getProperty(".server.baseUrl", "http://petstore.swagger.io/v2") + System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2") } }