Skip to content

Commit b500c89

Browse files
svenallerssvenallers
committed
Update samples
1 parent c9cf570 commit b500c89

15 files changed

Lines changed: 129 additions & 12 deletions

File tree

‎samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/apis/AuthApi.kt‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import org.openapitools.client.infrastructure.*
3030

3131
open class AuthApi(client: WebClient) : ApiClient(client) {
3232

33-
constructor(baseUrl: String) : this(WebClient.builder()
33+
constructor(baseUrl: String = ApiClient.BASE_URL) : this(WebClient.builder()
3434
.baseUrl(baseUrl)
3535
.codecs {
3636
it.defaultCodecs().jackson2JsonEncoder(Jackson2JsonEncoder(Serializer.jacksonObjectMapper, MediaType.APPLICATION_JSON))
@@ -39,6 +39,12 @@ open class AuthApi(client: WebClient) : ApiClient(client) {
3939
.build()
4040
)
4141

42+
companion object {
43+
fun createWithBasePath(baseUrl: String, basePath: String = ApiClient.BASE_PATH_WITHOUT_HOST): AuthApi {
44+
return AuthApi(createUrlWithBasePath(baseUrl, basePath))
45+
}
46+
}
47+
4248

4349
@Throws(WebClientResponseException::class)
4450
fun testAuthHttpBasic(): Mono<kotlin.String> {

‎samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/apis/BodyApi.kt‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import org.openapitools.client.infrastructure.*
3232

3333
open class BodyApi(client: WebClient) : ApiClient(client) {
3434

35-
constructor(baseUrl: String) : this(WebClient.builder()
35+
constructor(baseUrl: String = ApiClient.BASE_URL) : this(WebClient.builder()
3636
.baseUrl(baseUrl)
3737
.codecs {
3838
it.defaultCodecs().jackson2JsonEncoder(Jackson2JsonEncoder(Serializer.jacksonObjectMapper, MediaType.APPLICATION_JSON))
@@ -41,6 +41,12 @@ open class BodyApi(client: WebClient) : ApiClient(client) {
4141
.build()
4242
)
4343

44+
companion object {
45+
fun createWithBasePath(baseUrl: String, basePath: String = ApiClient.BASE_PATH_WITHOUT_HOST): BodyApi {
46+
return BodyApi(createUrlWithBasePath(baseUrl, basePath))
47+
}
48+
}
49+
4450

4551
@Throws(WebClientResponseException::class)
4652
fun testBinaryGif(): Mono<java.io.File> {

‎samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/apis/FormApi.kt‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import org.openapitools.client.infrastructure.*
3030

3131
open class FormApi(client: WebClient) : ApiClient(client) {
3232

33-
constructor(baseUrl: String) : this(WebClient.builder()
33+
constructor(baseUrl: String = ApiClient.BASE_URL) : this(WebClient.builder()
3434
.baseUrl(baseUrl)
3535
.codecs {
3636
it.defaultCodecs().jackson2JsonEncoder(Jackson2JsonEncoder(Serializer.jacksonObjectMapper, MediaType.APPLICATION_JSON))
@@ -39,6 +39,12 @@ open class FormApi(client: WebClient) : ApiClient(client) {
3939
.build()
4040
)
4141

42+
companion object {
43+
fun createWithBasePath(baseUrl: String, basePath: String = ApiClient.BASE_PATH_WITHOUT_HOST): FormApi {
44+
return FormApi(createUrlWithBasePath(baseUrl, basePath))
45+
}
46+
}
47+
4248

4349
@Throws(WebClientResponseException::class)
4450
fun testFormIntegerBooleanString(integerForm: kotlin.Int? = null, booleanForm: kotlin.Boolean? = null, stringForm: kotlin.String? = null): Mono<kotlin.String> {

‎samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/apis/HeaderApi.kt‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import org.openapitools.client.infrastructure.*
3131

3232
open class HeaderApi(client: WebClient) : ApiClient(client) {
3333

34-
constructor(baseUrl: String) : this(WebClient.builder()
34+
constructor(baseUrl: String = ApiClient.BASE_URL) : this(WebClient.builder()
3535
.baseUrl(baseUrl)
3636
.codecs {
3737
it.defaultCodecs().jackson2JsonEncoder(Jackson2JsonEncoder(Serializer.jacksonObjectMapper, MediaType.APPLICATION_JSON))
@@ -40,6 +40,12 @@ open class HeaderApi(client: WebClient) : ApiClient(client) {
4040
.build()
4141
)
4242

43+
companion object {
44+
fun createWithBasePath(baseUrl: String, basePath: String = ApiClient.BASE_PATH_WITHOUT_HOST): HeaderApi {
45+
return HeaderApi(createUrlWithBasePath(baseUrl, basePath))
46+
}
47+
}
48+
4349
/**
4450
* enum for parameter enumNonrefStringHeader
4551
*/

‎samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/apis/PathApi.kt‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import org.openapitools.client.infrastructure.*
3131

3232
open class PathApi(client: WebClient) : ApiClient(client) {
3333

34-
constructor(baseUrl: String) : this(WebClient.builder()
34+
constructor(baseUrl: String = ApiClient.BASE_URL) : this(WebClient.builder()
3535
.baseUrl(baseUrl)
3636
.codecs {
3737
it.defaultCodecs().jackson2JsonEncoder(Jackson2JsonEncoder(Serializer.jacksonObjectMapper, MediaType.APPLICATION_JSON))
@@ -40,6 +40,12 @@ open class PathApi(client: WebClient) : ApiClient(client) {
4040
.build()
4141
)
4242

43+
companion object {
44+
fun createWithBasePath(baseUrl: String, basePath: String = ApiClient.BASE_PATH_WITHOUT_HOST): PathApi {
45+
return PathApi(createUrlWithBasePath(baseUrl, basePath))
46+
}
47+
}
48+
4349
/**
4450
* enum for parameter enumNonrefStringPath
4551
*/

‎samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/apis/QueryApi.kt‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import org.openapitools.client.infrastructure.*
3333

3434
open class QueryApi(client: WebClient) : ApiClient(client) {
3535

36-
constructor(baseUrl: String) : this(WebClient.builder()
36+
constructor(baseUrl: String = ApiClient.BASE_URL) : this(WebClient.builder()
3737
.baseUrl(baseUrl)
3838
.codecs {
3939
it.defaultCodecs().jackson2JsonEncoder(Jackson2JsonEncoder(Serializer.jacksonObjectMapper, MediaType.APPLICATION_JSON))
@@ -42,6 +42,12 @@ open class QueryApi(client: WebClient) : ApiClient(client) {
4242
.build()
4343
)
4444

45+
companion object {
46+
fun createWithBasePath(baseUrl: String, basePath: String = ApiClient.BASE_PATH_WITHOUT_HOST): QueryApi {
47+
return QueryApi(createUrlWithBasePath(baseUrl, basePath))
48+
}
49+
}
50+
4551
/**
4652
* enum for parameter enumNonrefStringQuery
4753
*/

‎samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,20 @@ open class ApiClient(protected val client: WebClient) {
6666
}
6767
}
6868
}
69+
70+
companion object {
71+
const val BASE_URL: String = "http://localhost:3000"
72+
const val BASE_PATH_WITHOUT_HOST: String = ""
73+
}
74+
}
75+
76+
fun createUrlWithBasePath(baseUrl: String, basePath: String = ApiClient.BASE_PATH_WITHOUT_HOST): String {
77+
if(baseUrl.endsWith("/") && basePath.startsWith("/")) {
78+
return baseUrl.dropLast(1) + basePath
79+
} else if(!baseUrl.endsWith("/") && !basePath.startsWith("/")) {
80+
return "$baseUrl/$basePath"
81+
}
82+
return baseUrl + basePath
6983
}
7084

7185
inline fun <reified T: Any> parseDateToQueryString(value : T): String {
@@ -77,3 +91,4 @@ inline fun <reified T: Any> parseDateToQueryString(value : T): String {
7791
*/
7892
return Serializer.jacksonObjectMapper.writeValueAsString(value).replace("\"", "")
7993
}
94+

‎samples/client/petstore/kotlin-jvm-spring-2-webclient/src/main/kotlin/org/openapitools/client/apis/PetApi.kt‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import org.openapitools.client.infrastructure.*
3232

3333
open class PetApi(client: WebClient) : ApiClient(client) {
3434

35-
constructor(baseUrl: String) : this(WebClient.builder()
35+
constructor(baseUrl: String = ApiClient.BASE_URL) : this(WebClient.builder()
3636
.baseUrl(baseUrl)
3737
.codecs {
3838
it.defaultCodecs().jackson2JsonEncoder(Jackson2JsonEncoder(Serializer.jacksonObjectMapper, MediaType.APPLICATION_JSON))
@@ -41,6 +41,12 @@ open class PetApi(client: WebClient) : ApiClient(client) {
4141
.build()
4242
)
4343

44+
companion object {
45+
fun createWithBasePath(baseUrl: String, basePath: String = ApiClient.BASE_PATH_WITHOUT_HOST): PetApi {
46+
return PetApi(createUrlWithBasePath(baseUrl, basePath))
47+
}
48+
}
49+
4450

4551
@Throws(WebClientResponseException::class)
4652
fun addPet(pet: Pet): Mono<Pet> {

‎samples/client/petstore/kotlin-jvm-spring-2-webclient/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import org.openapitools.client.infrastructure.*
3131

3232
open class StoreApi(client: WebClient) : ApiClient(client) {
3333

34-
constructor(baseUrl: String) : this(WebClient.builder()
34+
constructor(baseUrl: String = ApiClient.BASE_URL) : this(WebClient.builder()
3535
.baseUrl(baseUrl)
3636
.codecs {
3737
it.defaultCodecs().jackson2JsonEncoder(Jackson2JsonEncoder(Serializer.jacksonObjectMapper, MediaType.APPLICATION_JSON))
@@ -40,6 +40,12 @@ open class StoreApi(client: WebClient) : ApiClient(client) {
4040
.build()
4141
)
4242

43+
companion object {
44+
fun createWithBasePath(baseUrl: String, basePath: String = ApiClient.BASE_PATH_WITHOUT_HOST): StoreApi {
45+
return StoreApi(createUrlWithBasePath(baseUrl, basePath))
46+
}
47+
}
48+
4349

4450
@Throws(WebClientResponseException::class)
4551
fun deleteOrder(orderId: kotlin.String): Mono<Unit> {

‎samples/client/petstore/kotlin-jvm-spring-2-webclient/src/main/kotlin/org/openapitools/client/apis/UserApi.kt‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import org.openapitools.client.infrastructure.*
3131

3232
open class UserApi(client: WebClient) : ApiClient(client) {
3333

34-
constructor(baseUrl: String) : this(WebClient.builder()
34+
constructor(baseUrl: String = ApiClient.BASE_URL) : this(WebClient.builder()
3535
.baseUrl(baseUrl)
3636
.codecs {
3737
it.defaultCodecs().jackson2JsonEncoder(Jackson2JsonEncoder(Serializer.jacksonObjectMapper, MediaType.APPLICATION_JSON))
@@ -40,6 +40,12 @@ open class UserApi(client: WebClient) : ApiClient(client) {
4040
.build()
4141
)
4242

43+
companion object {
44+
fun createWithBasePath(baseUrl: String, basePath: String = ApiClient.BASE_PATH_WITHOUT_HOST): UserApi {
45+
return UserApi(createUrlWithBasePath(baseUrl, basePath))
46+
}
47+
}
48+
4349

4450
@Throws(WebClientResponseException::class)
4551
fun createUser(user: User): Mono<Unit> {

0 commit comments

Comments
 (0)