Skip to content

Commit 74a9509

Browse files
marcel-huber-ptvmarcel-huber-ptv
authored
[Java][native] Fix: DateTime in deepObjects is no longer serialized correctly [fix #18742] (#18743)
* fix serialization of OffsetDateTime * update samples * wrap import
1 parent 9c999b6 commit 74a9509

File tree

143 files changed

+535
-395
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+535
-395
lines changed

‎modules/openapi-generator/src/main/resources/Java/libraries/native/ApiClient.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public class ApiClient {
5757
private Duration readTimeout;
5858
private Duration connectTimeout;
5959
60-
private static String valueToString(Object value) {
60+
public static String valueToString(Object value) {
6161
if (value == null) {
6262
return "";
6363
}

‎modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
{{#discriminator}}
22
import {{invokerPackage}}.JSON;
33
{{/discriminator}}
4+
{{#supportUrlQuery}}
5+
import {{invokerPackage}}.ApiClient;
6+
{{/supportUrlQuery}}
47
/**
58
* {{description}}{{^description}}{{classname}}{{/description}}{{#isDeprecated}}
69
* @deprecated{{/isDeprecated}}
@@ -408,7 +411,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
408411
for ({{{items.dataType}}} _item : {{getter}}()) {
409412
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix,
410413
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix),
411-
URLEncoder.encode(String.valueOf(_item), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
414+
URLEncoder.encode(ApiClient.valueToString(_item), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
412415
}
413416
i++;
414417
}
@@ -418,7 +421,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
418421
for (int i = 0; i < {{getter}}().size(); i++) {
419422
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix,
420423
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix),
421-
URLEncoder.encode(String.valueOf({{getter}}().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
424+
URLEncoder.encode(ApiClient.valueToString({{getter}}().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
422425
}
423426
}
424427
{{/uniqueItems}}
@@ -456,7 +459,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
456459
if (_item != null) {
457460
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix,
458461
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix),
459-
URLEncoder.encode(String.valueOf(_item), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
462+
URLEncoder.encode(ApiClient.valueToString(_item), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
460463
}
461464
i++;
462465
}
@@ -468,7 +471,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
468471
if ({{getter}}().get(i) != null) {
469472
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix,
470473
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix),
471-
URLEncoder.encode(String.valueOf({{getter}}().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
474+
URLEncoder.encode(ApiClient.valueToString({{getter}}().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
472475
}
473476
}
474477
}
@@ -483,7 +486,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
483486
for (String _key : {{getter}}().keySet()) {
484487
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix,
485488
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix),
486-
{{getter}}().get(_key), URLEncoder.encode(String.valueOf({{getter}}().get(_key)), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
489+
{{getter}}().get(_key), URLEncoder.encode(ApiClient.valueToString({{getter}}().get(_key)), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
487490
}
488491
}
489492
{{/items.isModel}}
@@ -501,7 +504,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
501504
{{^isMap}}
502505
{{#isPrimitiveType}}
503506
if ({{getter}}() != null) {
504-
joiner.add(String.format("%s{{{baseName}}}%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf({{{getter}}}()), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
507+
joiner.add(String.format("%s{{{baseName}}}%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString({{{getter}}}()), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
505508
}
506509
{{/isPrimitiveType}}
507510
{{^isPrimitiveType}}
@@ -512,7 +515,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
512515
{{/isModel}}
513516
{{^isModel}}
514517
if ({{getter}}() != null) {
515-
joiner.add(String.format("%s{{{baseName}}}%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf({{{getter}}}()), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
518+
joiner.add(String.format("%s{{{baseName}}}%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString({{{getter}}}()), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
516519
}
517520
{{/isModel}}
518521
{{/isPrimitiveType}}

‎samples/client/echo_api/java/native/src/main/java/org/openapitools/client/ApiClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public class ApiClient {
6666
private Duration readTimeout;
6767
private Duration connectTimeout;
6868

69-
private static String valueToString(Object value) {
69+
public static String valueToString(Object value) {
7070
if (value == null) {
7171
return "";
7272
}

‎samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Bird.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
2929

3030

31+
import org.openapitools.client.ApiClient;
3132
/**
3233
* Bird
3334
*/
@@ -172,12 +173,12 @@ public String toUrlQueryString(String prefix) {
172173

173174
// add `size` to the URL query string
174175
if (getSize() != null) {
175-
joiner.add(String.format("%ssize%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getSize()), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
176+
joiner.add(String.format("%ssize%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getSize()), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
176177
}
177178

178179
// add `color` to the URL query string
179180
if (getColor() != null) {
180-
joiner.add(String.format("%scolor%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getColor()), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
181+
joiner.add(String.format("%scolor%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getColor()), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
181182
}
182183

183184
return joiner.toString();

‎samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Category.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
2929

3030

31+
import org.openapitools.client.ApiClient;
3132
/**
3233
* Category
3334
*/
@@ -172,12 +173,12 @@ public String toUrlQueryString(String prefix) {
172173

173174
// add `id` to the URL query string
174175
if (getId() != null) {
175-
joiner.add(String.format("%sid%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getId()), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
176+
joiner.add(String.format("%sid%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getId()), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
176177
}
177178

178179
// add `name` to the URL query string
179180
if (getName() != null) {
180-
joiner.add(String.format("%sname%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
181+
joiner.add(String.format("%sname%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
181182
}
182183

183184
return joiner.toString();

‎samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/DataQuery.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
3333

3434

35+
import org.openapitools.client.ApiClient;
3536
/**
3637
* DataQuery
3738
*/
@@ -221,31 +222,31 @@ public String toUrlQueryString(String prefix) {
221222

222223
// add `id` to the URL query string
223224
if (getId() != null) {
224-
joiner.add(String.format("%sid%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getId()), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
225+
joiner.add(String.format("%sid%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getId()), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
225226
}
226227

227228
// add `outcomes` to the URL query string
228229
if (getOutcomes() != null) {
229230
for (int i = 0; i < getOutcomes().size(); i++) {
230231
joiner.add(String.format("%soutcomes%s%s=%s", prefix, suffix,
231232
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix),
232-
URLEncoder.encode(String.valueOf(getOutcomes().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
233+
URLEncoder.encode(ApiClient.valueToString(getOutcomes().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
233234
}
234235
}
235236

236237
// add `suffix` to the URL query string
237238
if (getSuffix() != null) {
238-
joiner.add(String.format("%ssuffix%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getSuffix()), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
239+
joiner.add(String.format("%ssuffix%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getSuffix()), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
239240
}
240241

241242
// add `text` to the URL query string
242243
if (getText() != null) {
243-
joiner.add(String.format("%stext%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getText()), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
244+
joiner.add(String.format("%stext%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getText()), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
244245
}
245246

246247
// add `date` to the URL query string
247248
if (getDate() != null) {
248-
joiner.add(String.format("%sdate%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getDate()), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
249+
joiner.add(String.format("%sdate%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getDate()), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
249250
}
250251

251252
return joiner.toString();

‎samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/DefaultValue.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
3636

3737

38+
import org.openapitools.client.ApiClient;
3839
/**
3940
* to test the default value of properties
4041
*/
@@ -505,7 +506,7 @@ public String toUrlQueryString(String prefix) {
505506
if (getArrayStringEnumRefDefault().get(i) != null) {
506507
joiner.add(String.format("%sarray_string_enum_ref_default%s%s=%s", prefix, suffix,
507508
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix),
508-
URLEncoder.encode(String.valueOf(getArrayStringEnumRefDefault().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
509+
URLEncoder.encode(ApiClient.valueToString(getArrayStringEnumRefDefault().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
509510
}
510511
}
511512
}
@@ -515,7 +516,7 @@ public String toUrlQueryString(String prefix) {
515516
for (int i = 0; i < getArrayStringEnumDefault().size(); i++) {
516517
joiner.add(String.format("%sarray_string_enum_default%s%s=%s", prefix, suffix,
517518
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix),
518-
URLEncoder.encode(String.valueOf(getArrayStringEnumDefault().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
519+
URLEncoder.encode(ApiClient.valueToString(getArrayStringEnumDefault().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
519520
}
520521
}
521522

@@ -524,7 +525,7 @@ public String toUrlQueryString(String prefix) {
524525
for (int i = 0; i < getArrayStringDefault().size(); i++) {
525526
joiner.add(String.format("%sarray_string_default%s%s=%s", prefix, suffix,
526527
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix),
527-
URLEncoder.encode(String.valueOf(getArrayStringDefault().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
528+
URLEncoder.encode(ApiClient.valueToString(getArrayStringDefault().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
528529
}
529530
}
530531

@@ -533,7 +534,7 @@ public String toUrlQueryString(String prefix) {
533534
for (int i = 0; i < getArrayIntegerDefault().size(); i++) {
534535
joiner.add(String.format("%sarray_integer_default%s%s=%s", prefix, suffix,
535536
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix),
536-
URLEncoder.encode(String.valueOf(getArrayIntegerDefault().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
537+
URLEncoder.encode(ApiClient.valueToString(getArrayIntegerDefault().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
537538
}
538539
}
539540

@@ -542,7 +543,7 @@ public String toUrlQueryString(String prefix) {
542543
for (int i = 0; i < getArrayString().size(); i++) {
543544
joiner.add(String.format("%sarray_string%s%s=%s", prefix, suffix,
544545
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix),
545-
URLEncoder.encode(String.valueOf(getArrayString().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
546+
URLEncoder.encode(ApiClient.valueToString(getArrayString().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
546547
}
547548
}
548549

@@ -551,7 +552,7 @@ public String toUrlQueryString(String prefix) {
551552
for (int i = 0; i < getArrayStringNullable().size(); i++) {
552553
joiner.add(String.format("%sarray_string_nullable%s%s=%s", prefix, suffix,
553554
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix),
554-
URLEncoder.encode(String.valueOf(getArrayStringNullable().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
555+
URLEncoder.encode(ApiClient.valueToString(getArrayStringNullable().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
555556
}
556557
}
557558

@@ -560,13 +561,13 @@ public String toUrlQueryString(String prefix) {
560561
for (int i = 0; i < getArrayStringExtensionNullable().size(); i++) {
561562
joiner.add(String.format("%sarray_string_extension_nullable%s%s=%s", prefix, suffix,
562563
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix),
563-
URLEncoder.encode(String.valueOf(getArrayStringExtensionNullable().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
564+
URLEncoder.encode(ApiClient.valueToString(getArrayStringExtensionNullable().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
564565
}
565566
}
566567

567568
// add `string_nullable` to the URL query string
568569
if (getStringNullable() != null) {
569-
joiner.add(String.format("%sstring_nullable%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getStringNullable()), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
570+
joiner.add(String.format("%sstring_nullable%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getStringNullable()), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
570571
}
571572

572573
return joiner.toString();

‎samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
3030

3131

32+
import org.openapitools.client.ApiClient;
3233
/**
3334
* NumberPropertiesOnly
3435
*/
@@ -206,17 +207,17 @@ public String toUrlQueryString(String prefix) {
206207

207208
// add `number` to the URL query string
208209
if (getNumber() != null) {
209-
joiner.add(String.format("%snumber%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getNumber()), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
210+
joiner.add(String.format("%snumber%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getNumber()), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
210211
}
211212

212213
// add `float` to the URL query string
213214
if (getFloat() != null) {
214-
joiner.add(String.format("%sfloat%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getFloat()), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
215+
joiner.add(String.format("%sfloat%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getFloat()), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
215216
}
216217

217218
// add `double` to the URL query string
218219
if (getDouble() != null) {
219-
joiner.add(String.format("%sdouble%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getDouble()), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
220+
joiner.add(String.format("%sdouble%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getDouble()), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
220221
}
221222

222223
return joiner.toString();

‎samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Pet.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
3333

3434

35+
import org.openapitools.client.ApiClient;
3536
/**
3637
* Pet
3738
*/
@@ -353,12 +354,12 @@ public String toUrlQueryString(String prefix) {
353354

354355
// add `id` to the URL query string
355356
if (getId() != null) {
356-
joiner.add(String.format("%sid%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getId()), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
357+
joiner.add(String.format("%sid%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getId()), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
357358
}
358359

359360
// add `name` to the URL query string
360361
if (getName() != null) {
361-
joiner.add(String.format("%sname%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
362+
joiner.add(String.format("%sname%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
362363
}
363364

364365
// add `category` to the URL query string
@@ -371,7 +372,7 @@ public String toUrlQueryString(String prefix) {
371372
for (int i = 0; i < getPhotoUrls().size(); i++) {
372373
joiner.add(String.format("%sphotoUrls%s%s=%s", prefix, suffix,
373374
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix),
374-
URLEncoder.encode(String.valueOf(getPhotoUrls().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
375+
URLEncoder.encode(ApiClient.valueToString(getPhotoUrls().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
375376
}
376377
}
377378

@@ -387,7 +388,7 @@ public String toUrlQueryString(String prefix) {
387388

388389
// add `status` to the URL query string
389390
if (getStatus() != null) {
390-
joiner.add(String.format("%sstatus%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getStatus()), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
391+
joiner.add(String.format("%sstatus%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getStatus()), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
391392
}
392393

393394
return joiner.toString();

‎samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Query.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
3131

3232

33+
import org.openapitools.client.ApiClient;
3334
/**
3435
* Query
3536
*/
@@ -219,15 +220,15 @@ public String toUrlQueryString(String prefix) {
219220

220221
// add `id` to the URL query string
221222
if (getId() != null) {
222-
joiner.add(String.format("%sid%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getId()), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
223+
joiner.add(String.format("%sid%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getId()), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
223224
}
224225

225226
// add `outcomes` to the URL query string
226227
if (getOutcomes() != null) {
227228
for (int i = 0; i < getOutcomes().size(); i++) {
228229
joiner.add(String.format("%soutcomes%s%s=%s", prefix, suffix,
229230
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix),
230-
URLEncoder.encode(String.valueOf(getOutcomes().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
231+
URLEncoder.encode(ApiClient.valueToString(getOutcomes().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20")));
231232
}
232233
}
233234

0 commit comments

Comments
 (0)