Skip to content

Commit 75b883c

Browse files
YartsevMikhail Yartsev
Yartsev
and
Mikhail Yartsev
authored
OkHttpClient - fix enum properties in requests (#12661)
* OkHttpClient - fix enum properties in requests * Has been committed the generated code Co-authored-by: Mikhail Yartsev <mihail.yartsev@lamoda.ru>
1 parent b1ea0f3 commit 75b883c

39 files changed

Lines changed: 111 additions & 111 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ import {{packageName}}.infrastructure.toMultiValue
224224

225225
return RequestConfig(
226226
method = RequestMethod.{{httpMethod}},
227-
path = "{{path}}"{{#pathParams}}.replace("{"+"{{baseName}}"+"}", {{#isContainer}}{{paramName}}.joinToString(","){{/isContainer}}{{^isContainer}}"${{{paramName}}}"{{/isContainer}}){{/pathParams}},
227+
path = "{{path}}"{{#pathParams}}.replace("{"+"{{baseName}}"+"}", {{#isContainer}}{{paramName}}.joinToString(","){{/isContainer}}{{^isContainer}}{{{paramName}}}{{#isEnum}}.value{{/isEnum}}.toString(){{/isContainer}}){{/pathParams}},
228228
query = localVariableQuery,
229229
headers = localVariableHeaders,
230230
body = localVariableBody

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ class DefaultApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
223223

224224
return RequestConfig(
225225
method = RequestMethod.POST,
226-
path = "/test".replace("{"+"pi0"+"}", "$pi0").replace("{"+"pi1"+"}", "$pi1").replace("{"+"pn0"+"}", "$pn0").replace("{"+"pn1"+"}", "$pn1"),
226+
path = "/test".replace("{"+"pi0"+"}", pi0.toString()).replace("{"+"pi1"+"}", pi1.toString()).replace("{"+"pn0"+"}", pn0.toString()).replace("{"+"pn1"+"}", pn1.toString()),
227227
query = localVariableQuery,
228228
headers = localVariableHeaders,
229229
body = localVariableBody

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ class DefaultApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
223223

224224
return RequestConfig(
225225
method = RequestMethod.POST,
226-
path = "/test".replace("{"+"pi0"+"}", "$pi0").replace("{"+"pi1"+"}", "$pi1").replace("{"+"pn0"+"}", "$pn0").replace("{"+"pn1"+"}", "$pn1"),
226+
path = "/test".replace("{"+"pi0"+"}", pi0.toString()).replace("{"+"pi1"+"}", pi1.toString()).replace("{"+"pn0"+"}", pn0.toString()).replace("{"+"pn1"+"}", pn1.toString()),
227227
query = localVariableQuery,
228228
headers = localVariableHeaders,
229229
body = localVariableBody

‎samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
182182

183183
return RequestConfig(
184184
method = RequestMethod.DELETE,
185-
path = "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
185+
path = "/pet/{petId}".replace("{"+"petId"+"}", petId.toString()),
186186
query = localVariableQuery,
187187
headers = localVariableHeaders,
188188
body = localVariableBody
@@ -412,7 +412,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
412412

413413
return RequestConfig(
414414
method = RequestMethod.GET,
415-
path = "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
415+
path = "/pet/{petId}".replace("{"+"petId"+"}", petId.toString()),
416416
query = localVariableQuery,
417417
headers = localVariableHeaders,
418418
body = localVariableBody
@@ -555,7 +555,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
555555

556556
return RequestConfig(
557557
method = RequestMethod.POST,
558-
path = "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
558+
path = "/pet/{petId}".replace("{"+"petId"+"}", petId.toString()),
559559
query = localVariableQuery,
560560
headers = localVariableHeaders,
561561
body = localVariableBody
@@ -633,7 +633,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
633633

634634
return RequestConfig(
635635
method = RequestMethod.POST,
636-
path = "/pet/{petId}/uploadImage".replace("{"+"petId"+"}", "$petId"),
636+
path = "/pet/{petId}/uploadImage".replace("{"+"petId"+"}", petId.toString()),
637637
query = localVariableQuery,
638638
headers = localVariableHeaders,
639639
body = localVariableBody

‎samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class StoreApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient =
109109

110110
return RequestConfig(
111111
method = RequestMethod.DELETE,
112-
path = "/store/order/{orderId}".replace("{"+"orderId"+"}", "$orderId"),
112+
path = "/store/order/{orderId}".replace("{"+"orderId"+"}", orderId.toString()),
113113
query = localVariableQuery,
114114
headers = localVariableHeaders,
115115
body = localVariableBody
@@ -246,7 +246,7 @@ class StoreApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient =
246246

247247
return RequestConfig(
248248
method = RequestMethod.GET,
249-
path = "/store/order/{orderId}".replace("{"+"orderId"+"}", "$orderId"),
249+
path = "/store/order/{orderId}".replace("{"+"orderId"+"}", orderId.toString()),
250250
query = localVariableQuery,
251251
headers = localVariableHeaders,
252252
body = localVariableBody

‎samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ class UserApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient =
310310

311311
return RequestConfig(
312312
method = RequestMethod.DELETE,
313-
path = "/user/{username}".replace("{"+"username"+"}", "$username"),
313+
path = "/user/{username}".replace("{"+"username"+"}", username.toString()),
314314
query = localVariableQuery,
315315
headers = localVariableHeaders,
316316
body = localVariableBody
@@ -380,7 +380,7 @@ class UserApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient =
380380

381381
return RequestConfig(
382382
method = RequestMethod.GET,
383-
path = "/user/{username}".replace("{"+"username"+"}", "$username"),
383+
path = "/user/{username}".replace("{"+"username"+"}", username.toString()),
384384
query = localVariableQuery,
385385
headers = localVariableHeaders,
386386
body = localVariableBody
@@ -591,7 +591,7 @@ class UserApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient =
591591

592592
return RequestConfig(
593593
method = RequestMethod.PUT,
594-
path = "/user/{username}".replace("{"+"username"+"}", "$username"),
594+
path = "/user/{username}".replace("{"+"username"+"}", username.toString()),
595595
query = localVariableQuery,
596596
headers = localVariableHeaders,
597597
body = localVariableBody

‎samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
182182

183183
return RequestConfig(
184184
method = RequestMethod.DELETE,
185-
path = "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
185+
path = "/pet/{petId}".replace("{"+"petId"+"}", petId.toString()),
186186
query = localVariableQuery,
187187
headers = localVariableHeaders,
188188
body = localVariableBody
@@ -412,7 +412,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
412412

413413
return RequestConfig(
414414
method = RequestMethod.GET,
415-
path = "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
415+
path = "/pet/{petId}".replace("{"+"petId"+"}", petId.toString()),
416416
query = localVariableQuery,
417417
headers = localVariableHeaders,
418418
body = localVariableBody
@@ -555,7 +555,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
555555

556556
return RequestConfig(
557557
method = RequestMethod.POST,
558-
path = "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
558+
path = "/pet/{petId}".replace("{"+"petId"+"}", petId.toString()),
559559
query = localVariableQuery,
560560
headers = localVariableHeaders,
561561
body = localVariableBody
@@ -633,7 +633,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
633633

634634
return RequestConfig(
635635
method = RequestMethod.POST,
636-
path = "/pet/{petId}/uploadImage".replace("{"+"petId"+"}", "$petId"),
636+
path = "/pet/{petId}/uploadImage".replace("{"+"petId"+"}", petId.toString()),
637637
query = localVariableQuery,
638638
headers = localVariableHeaders,
639639
body = localVariableBody

‎samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class StoreApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient =
109109

110110
return RequestConfig(
111111
method = RequestMethod.DELETE,
112-
path = "/store/order/{orderId}".replace("{"+"orderId"+"}", "$orderId"),
112+
path = "/store/order/{orderId}".replace("{"+"orderId"+"}", orderId.toString()),
113113
query = localVariableQuery,
114114
headers = localVariableHeaders,
115115
body = localVariableBody
@@ -246,7 +246,7 @@ class StoreApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient =
246246

247247
return RequestConfig(
248248
method = RequestMethod.GET,
249-
path = "/store/order/{orderId}".replace("{"+"orderId"+"}", "$orderId"),
249+
path = "/store/order/{orderId}".replace("{"+"orderId"+"}", orderId.toString()),
250250
query = localVariableQuery,
251251
headers = localVariableHeaders,
252252
body = localVariableBody

‎samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ class UserApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient =
310310

311311
return RequestConfig(
312312
method = RequestMethod.DELETE,
313-
path = "/user/{username}".replace("{"+"username"+"}", "$username"),
313+
path = "/user/{username}".replace("{"+"username"+"}", username.toString()),
314314
query = localVariableQuery,
315315
headers = localVariableHeaders,
316316
body = localVariableBody
@@ -380,7 +380,7 @@ class UserApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient =
380380

381381
return RequestConfig(
382382
method = RequestMethod.GET,
383-
path = "/user/{username}".replace("{"+"username"+"}", "$username"),
383+
path = "/user/{username}".replace("{"+"username"+"}", username.toString()),
384384
query = localVariableQuery,
385385
headers = localVariableHeaders,
386386
body = localVariableBody
@@ -591,7 +591,7 @@ class UserApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient =
591591

592592
return RequestConfig(
593593
method = RequestMethod.PUT,
594-
path = "/user/{username}".replace("{"+"username"+"}", "$username"),
594+
path = "/user/{username}".replace("{"+"username"+"}", username.toString()),
595595
query = localVariableQuery,
596596
headers = localVariableHeaders,
597597
body = localVariableBody

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
182182

183183
return RequestConfig(
184184
method = RequestMethod.DELETE,
185-
path = "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
185+
path = "/pet/{petId}".replace("{"+"petId"+"}", petId.toString()),
186186
query = localVariableQuery,
187187
headers = localVariableHeaders,
188188
body = localVariableBody
@@ -405,7 +405,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
405405

406406
return RequestConfig(
407407
method = RequestMethod.GET,
408-
path = "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
408+
path = "/pet/{petId}".replace("{"+"petId"+"}", petId.toString()),
409409
query = localVariableQuery,
410410
headers = localVariableHeaders,
411411
body = localVariableBody
@@ -548,7 +548,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
548548

549549
return RequestConfig(
550550
method = RequestMethod.POST,
551-
path = "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
551+
path = "/pet/{petId}".replace("{"+"petId"+"}", petId.toString()),
552552
query = localVariableQuery,
553553
headers = localVariableHeaders,
554554
body = localVariableBody
@@ -626,7 +626,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
626626

627627
return RequestConfig(
628628
method = RequestMethod.POST,
629-
path = "/pet/{petId}/uploadImage".replace("{"+"petId"+"}", "$petId"),
629+
path = "/pet/{petId}/uploadImage".replace("{"+"petId"+"}", petId.toString()),
630630
query = localVariableQuery,
631631
headers = localVariableHeaders,
632632
body = localVariableBody

0 commit comments

Comments
 (0)