diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java index c466730a1d7..7a6e0f73f2d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java @@ -31,7 +31,6 @@ import io.swagger.v3.oas.models.parameters.Parameter; import io.swagger.v3.oas.models.parameters.RequestBody; import io.swagger.v3.oas.models.servers.Server; import io.swagger.v3.parser.util.SchemaTypeUtil; -import java.text.SimpleDateFormat; import lombok.Getter; import lombok.Setter; import org.apache.commons.io.FilenameUtils; @@ -54,6 +53,8 @@ import org.slf4j.LoggerFactory; import java.io.File; import java.time.LocalDate; import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; import java.util.*; import java.util.concurrent.ConcurrentSkipListSet; import java.util.regex.Matcher; @@ -72,7 +73,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code private final Logger LOGGER = LoggerFactory.getLogger(AbstractJavaCodegen.class); private static final String ARTIFACT_VERSION_DEFAULT_VALUE = "1.0.0"; - private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd", Locale.ROOT); + private static final ZoneId UTC = ZoneId.of("UTC"); public static final String DEFAULT_LIBRARY = ""; public static final String DATE_LIBRARY = "dateLibrary"; @@ -1641,7 +1642,8 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code public String toExampleValue(Schema p) { if (p.getExample() != null) { if (p.getExample() instanceof Date) { - return DATE_FORMAT.format(p.getExample()); + Date date = (Date)p.getExample(); + return DateTimeFormatter.ISO_LOCAL_DATE.format(ZonedDateTime.ofInstant(date.toInstant(), UTC)); } return escapeText(p.getExample().toString()); } else { diff --git a/modules/openapi-generator/src/main/resources/Java/Configuration.mustache b/modules/openapi-generator/src/main/resources/Java/Configuration.mustache index 8e9720e36d7..61b08ab67ed 100644 --- a/modules/openapi-generator/src/main/resources/Java/Configuration.mustache +++ b/modules/openapi-generator/src/main/resources/Java/Configuration.mustache @@ -6,7 +6,7 @@ package {{invokerPackage}}; public class Configuration { public static final String VERSION = "{{{artifactVersion}}}"; - private static ApiClient defaultApiClient = new ApiClient(); + private static volatile ApiClient defaultApiClient = new ApiClient(); /** * Get the default API client, which would be used when creating API diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/anyof_model.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/anyof_model.mustache index dfb6464d579..7cc5081d87a 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/native/anyof_model.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/anyof_model.mustache @@ -16,6 +16,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import com.fasterxml.jackson.databind.ser.std.StdSerializer; +import {{invokerPackage}}.ApiClient; import {{invokerPackage}}.JSON; {{>additionalModelTypeAnnotations}}{{>generatedAnnotation}}{{>xmlAnnotation}} @@ -241,7 +242,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im for ({{{items.dataType}}} _item : ({{{dataType}}})getActualInstance()) { joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(String.valueOf(_item), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(String.valueOf(_item)))); } i++; } @@ -251,7 +252,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im for (int i = 0; i < (({{{dataType}}})getActualInstance()).size(); i++) { joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(String.valueOf(getActualInstance().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(String.valueOf(getActualInstance().get(i))))); } } {{/uniqueItems}} @@ -289,7 +290,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im if (_item != null) { joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(String.valueOf(_item), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(String.valueOf(_item)))); } i++; } @@ -301,7 +302,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im if (getActualInstance().get(i) != null) { joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(String.valueOf((({{{dataType}}})getActualInstance()).get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(String.valueOf((({{{dataType}}})getActualInstance()).get(i))))); } } } @@ -316,7 +317,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im for (String _key : (({{{dataType}}})getActualInstance()).keySet()) { joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix), - getActualInstance().get(_key), URLEncoder.encode(String.valueOf((({{{dataType}}})getActualInstance()).get(_key)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + getActualInstance().get(_key), ApiClient.urlEncode(String.valueOf((({{{dataType}}})getActualInstance()).get(_key))))); } } {{/items.isPrimitiveType}} @@ -334,7 +335,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im {{^isMap}} {{#isPrimitiveType}} if (getActualInstance() != null) { - joiner.add(String.format("%s{{{baseName}}}%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getActualInstance()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%s{{{baseName}}}%s=%s", prefix, suffix, ApiClient.urlEncode(String.valueOf(getActualInstance())))); } {{/isPrimitiveType}} {{^isPrimitiveType}} @@ -345,7 +346,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im {{/isModel}} {{^isModel}} if (getActualInstance() != null) { - joiner.add(String.format("%s{{{baseName}}}%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getActualInstance()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%s{{{baseName}}}%s=%s", prefix, suffix, ApiClient.urlEncode(String.valueOf(getActualInstance())))); } {{/isModel}} {{/isPrimitiveType}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/api.mustache index 366e3689df7..c100f2f81c3 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/native/api.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/api.mustache @@ -4,6 +4,7 @@ package {{package}}; import {{invokerPackage}}.ApiClient; import {{invokerPackage}}.ApiException; import {{invokerPackage}}.ApiResponse; +import {{invokerPackage}}.Configuration; import {{invokerPackage}}.Pair; {{#imports}} @@ -64,7 +65,7 @@ public class {{classname}} { private final Consumer> memberVarAsyncResponseInterceptor; public {{classname}}() { - this(new ApiClient()); + this(Configuration.getDefaultApiClient()); } public {{classname}}(ApiClient apiClient) { diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/oneof_model.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/oneof_model.mustache index 8aa2ef073d8..cbb4a6d63a2 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/native/oneof_model.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/oneof_model.mustache @@ -18,6 +18,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import com.fasterxml.jackson.databind.ser.std.StdSerializer; +import {{invokerPackage}}.ApiClient; import {{invokerPackage}}.JSON; {{>additionalModelTypeAnnotations}}{{>generatedAnnotation}}{{>xmlAnnotation}} @@ -274,7 +275,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im for ({{{items.dataType}}} _item : ({{{dataType}}})getActualInstance()) { joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(String.valueOf(_item), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(String.valueOf(_item)))); } i++; } @@ -284,7 +285,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im for (int i = 0; i < (({{{dataType}}})getActualInstance()).size(); i++) { joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(String.valueOf(getActualInstance().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(String.valueOf(getActualInstance().get(i))))); } } {{/uniqueItems}} @@ -322,7 +323,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im if (_item != null) { joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(String.valueOf(_item), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(String.valueOf(_item)))); } i++; } @@ -334,7 +335,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im if (getActualInstance().get(i) != null) { joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(String.valueOf((({{{dataType}}})getActualInstance()).get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(String.valueOf((({{{dataType}}})getActualInstance()).get(i))))); } } } @@ -349,7 +350,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im for (String _key : (({{{dataType}}})getActualInstance()).keySet()) { joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix), - getActualInstance().get(_key), URLEncoder.encode(String.valueOf((({{{dataType}}})getActualInstance()).get(_key)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + getActualInstance().get(_key), ApiClient.urlEncode(String.valueOf((({{{dataType}}})getActualInstance()).get(_key))))); } } {{/items.isPrimitiveType}} @@ -367,7 +368,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im {{^isMap}} {{#isPrimitiveType}} if (getActualInstance() != null) { - joiner.add(String.format("%s{{{baseName}}}%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getActualInstance()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%s{{{baseName}}}%s=%s", prefix, suffix, ApiClient.urlEncode(String.valueOf(getActualInstance())))); } {{/isPrimitiveType}} {{^isPrimitiveType}} @@ -378,7 +379,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im {{/isModel}} {{^isModel}} if (getActualInstance() != null) { - joiner.add(String.format("%s{{{baseName}}}%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getActualInstance()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%s{{{baseName}}}%s=%s", prefix, suffix, ApiClient.urlEncode(String.valueOf(getActualInstance())))); } {{/isModel}} {{/isPrimitiveType}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache index fdb779be03a..5413d1cdcd8 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache @@ -386,7 +386,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens for ({{{items.dataType}}} _item : {{getter}}()) { joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(ApiClient.valueToString(_item), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(ApiClient.valueToString(_item)))); } i++; } @@ -396,7 +396,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens for (int i = 0; i < {{getter}}().size(); i++) { joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(ApiClient.valueToString({{getter}}().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(ApiClient.valueToString({{getter}}().get(i))))); } } {{/uniqueItems}} @@ -434,7 +434,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens if (_item != null) { joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(ApiClient.valueToString(_item), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(ApiClient.valueToString(_item)))); } i++; } @@ -446,7 +446,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens if ({{getter}}().get(i) != null) { joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(ApiClient.valueToString({{getter}}().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(ApiClient.valueToString({{getter}}().get(i))))); } } } @@ -461,7 +461,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens for (String _key : {{getter}}().keySet()) { joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix), - {{getter}}().get(_key), URLEncoder.encode(ApiClient.valueToString({{getter}}().get(_key)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + {{getter}}().get(_key), ApiClient.urlEncode(ApiClient.valueToString({{getter}}().get(_key))))); } } {{/items.isModel}} @@ -479,7 +479,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens {{^isMap}} {{#isPrimitiveType}} if ({{getter}}() != null) { - joiner.add(String.format("%s{{{baseName}}}%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString({{{getter}}}()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%s{{{baseName}}}%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString({{{getter}}}())))); } {{/isPrimitiveType}} {{^isPrimitiveType}} @@ -490,7 +490,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens {{/isModel}} {{^isModel}} if ({{getter}}() != null) { - joiner.add(String.format("%s{{{baseName}}}%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString({{{getter}}}()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%s{{{baseName}}}%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString({{{getter}}}())))); } {{/isModel}} {{/isPrimitiveType}} diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java index 5a004f257cb..20b1b62c8db 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java @@ -970,6 +970,6 @@ public class AbstractJavaCodegenTest { final OpenAPI openAPI = FLATTENED_SPEC.get("3_0/spring/date-time-parameter-types-for-testing"); codegen.setOpenAPI(openAPI); DateSchema dateSchema = (DateSchema) openAPI.getPaths().get("/thingy/{date}").getPost().getParameters().get(0).getSchema(); - Assert.assertTrue(codegen.escapeQuotationMark(codegen.toExampleValue(dateSchema)).matches("2021-01-01")); + assertThat(codegen.escapeQuotationMark(codegen.toExampleValue(dateSchema))).isEqualTo("2021-01-01"); } } diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/Configuration.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/Configuration.java index 6c53ce74d86..2fffb41c5da 100644 --- a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/Configuration.java +++ b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/Configuration.java @@ -17,7 +17,7 @@ package org.openapitools.client; public class Configuration { public static final String VERSION = "0.1.0"; - private static ApiClient defaultApiClient = new ApiClient(); + private static volatile ApiClient defaultApiClient = new ApiClient(); /** * Get the default API client, which would be used when creating API diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/Configuration.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/Configuration.java index 6c53ce74d86..2fffb41c5da 100644 --- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/Configuration.java +++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/Configuration.java @@ -17,7 +17,7 @@ package org.openapitools.client; public class Configuration { public static final String VERSION = "0.1.0"; - private static ApiClient defaultApiClient = new ApiClient(); + private static volatile ApiClient defaultApiClient = new ApiClient(); /** * Get the default API client, which would be used when creating API diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/AuthApi.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/AuthApi.java index 0858ea0f7ca..a1e4a8b99ef 100644 --- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/AuthApi.java +++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/AuthApi.java @@ -15,6 +15,7 @@ package org.openapitools.client.api; import org.openapitools.client.ApiClient; import org.openapitools.client.ApiException; import org.openapitools.client.ApiResponse; +import org.openapitools.client.Configuration; import org.openapitools.client.Pair; @@ -54,7 +55,7 @@ public class AuthApi { private final Consumer> memberVarAsyncResponseInterceptor; public AuthApi() { - this(new ApiClient()); + this(Configuration.getDefaultApiClient()); } public AuthApi(ApiClient apiClient) { diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/BodyApi.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/BodyApi.java index 94cdf3b3811..524284e1527 100644 --- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/BodyApi.java +++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/BodyApi.java @@ -15,6 +15,7 @@ package org.openapitools.client.api; import org.openapitools.client.ApiClient; import org.openapitools.client.ApiException; import org.openapitools.client.ApiResponse; +import org.openapitools.client.Configuration; import org.openapitools.client.Pair; import java.io.File; @@ -64,7 +65,7 @@ public class BodyApi { private final Consumer> memberVarAsyncResponseInterceptor; public BodyApi() { - this(new ApiClient()); + this(Configuration.getDefaultApiClient()); } public BodyApi(ApiClient apiClient) { diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/FormApi.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/FormApi.java index 37bc1f29f13..de3ba6eacb9 100644 --- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/FormApi.java +++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/FormApi.java @@ -15,6 +15,7 @@ package org.openapitools.client.api; import org.openapitools.client.ApiClient; import org.openapitools.client.ApiException; import org.openapitools.client.ApiResponse; +import org.openapitools.client.Configuration; import org.openapitools.client.Pair; import org.openapitools.client.model.TestFormObjectMultipartRequestMarker; @@ -61,7 +62,7 @@ public class FormApi { private final Consumer> memberVarAsyncResponseInterceptor; public FormApi() { - this(new ApiClient()); + this(Configuration.getDefaultApiClient()); } public FormApi(ApiClient apiClient) { diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/HeaderApi.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/HeaderApi.java index a30780f768c..150964136ae 100644 --- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/HeaderApi.java +++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/HeaderApi.java @@ -15,6 +15,7 @@ package org.openapitools.client.api; import org.openapitools.client.ApiClient; import org.openapitools.client.ApiException; import org.openapitools.client.ApiResponse; +import org.openapitools.client.Configuration; import org.openapitools.client.Pair; import org.openapitools.client.model.StringEnumRef; @@ -61,7 +62,7 @@ public class HeaderApi { private final Consumer> memberVarAsyncResponseInterceptor; public HeaderApi() { - this(new ApiClient()); + this(Configuration.getDefaultApiClient()); } public HeaderApi(ApiClient apiClient) { diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/PathApi.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/PathApi.java index e3f0e96bffe..78a6182e945 100644 --- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/PathApi.java +++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/PathApi.java @@ -15,6 +15,7 @@ package org.openapitools.client.api; import org.openapitools.client.ApiClient; import org.openapitools.client.ApiException; import org.openapitools.client.ApiResponse; +import org.openapitools.client.Configuration; import org.openapitools.client.Pair; import org.openapitools.client.model.StringEnumRef; @@ -61,7 +62,7 @@ public class PathApi { private final Consumer> memberVarAsyncResponseInterceptor; public PathApi() { - this(new ApiClient()); + this(Configuration.getDefaultApiClient()); } public PathApi(ApiClient apiClient) { diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/QueryApi.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/QueryApi.java index d0352f5fd8f..b285ebf4656 100644 --- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/QueryApi.java +++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/QueryApi.java @@ -15,6 +15,7 @@ package org.openapitools.client.api; import org.openapitools.client.ApiClient; import org.openapitools.client.ApiException; import org.openapitools.client.ApiResponse; +import org.openapitools.client.Configuration; import org.openapitools.client.Pair; import org.openapitools.client.model.DataQuery; @@ -67,7 +68,7 @@ public class QueryApi { private final Consumer> memberVarAsyncResponseInterceptor; public QueryApi() { - this(new ApiClient()); + this(Configuration.getDefaultApiClient()); } public QueryApi(ApiClient apiClient) { diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Bird.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Bird.java index 81831e0b1b9..6676691ebb7 100644 --- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Bird.java +++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Bird.java @@ -173,12 +173,12 @@ public class Bird { // add `size` to the URL query string if (getSize() != null) { - joiner.add(String.format("%ssize%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getSize()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%ssize%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getSize())))); } // add `color` to the URL query string if (getColor() != null) { - joiner.add(String.format("%scolor%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getColor()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%scolor%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getColor())))); } return joiner.toString(); diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Category.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Category.java index 9a44df3945e..71a9af82e89 100644 --- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Category.java +++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Category.java @@ -173,12 +173,12 @@ public class Category { // add `id` to the URL query string if (getId() != null) { - joiner.add(String.format("%sid%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getId()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sid%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getId())))); } // add `name` to the URL query string if (getName() != null) { - joiner.add(String.format("%sname%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sname%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getName())))); } return joiner.toString(); diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/DataQuery.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/DataQuery.java index ef55b7db3c8..34642e7b8f1 100644 --- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/DataQuery.java +++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/DataQuery.java @@ -222,7 +222,7 @@ public class DataQuery extends Query { // add `id` to the URL query string if (getId() != null) { - joiner.add(String.format("%sid%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getId()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sid%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getId())))); } // add `outcomes` to the URL query string @@ -230,23 +230,23 @@ public class DataQuery extends Query { for (int i = 0; i < getOutcomes().size(); i++) { joiner.add(String.format("%soutcomes%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(ApiClient.valueToString(getOutcomes().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(ApiClient.valueToString(getOutcomes().get(i))))); } } // add `suffix` to the URL query string if (getSuffix() != null) { - joiner.add(String.format("%ssuffix%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getSuffix()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%ssuffix%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getSuffix())))); } // add `text` to the URL query string if (getText() != null) { - joiner.add(String.format("%stext%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getText()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%stext%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getText())))); } // add `date` to the URL query string if (getDate() != null) { - joiner.add(String.format("%sdate%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getDate()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sdate%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getDate())))); } return joiner.toString(); diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/DefaultValue.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/DefaultValue.java index 737c6463b2d..876d63f9e9e 100644 --- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/DefaultValue.java +++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/DefaultValue.java @@ -503,7 +503,7 @@ public class DefaultValue { if (getArrayStringEnumRefDefault().get(i) != null) { joiner.add(String.format("%sarray_string_enum_ref_default%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(ApiClient.valueToString(getArrayStringEnumRefDefault().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(ApiClient.valueToString(getArrayStringEnumRefDefault().get(i))))); } } } @@ -513,7 +513,7 @@ public class DefaultValue { for (int i = 0; i < getArrayStringEnumDefault().size(); i++) { joiner.add(String.format("%sarray_string_enum_default%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(ApiClient.valueToString(getArrayStringEnumDefault().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(ApiClient.valueToString(getArrayStringEnumDefault().get(i))))); } } @@ -522,7 +522,7 @@ public class DefaultValue { for (int i = 0; i < getArrayStringDefault().size(); i++) { joiner.add(String.format("%sarray_string_default%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(ApiClient.valueToString(getArrayStringDefault().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(ApiClient.valueToString(getArrayStringDefault().get(i))))); } } @@ -531,7 +531,7 @@ public class DefaultValue { for (int i = 0; i < getArrayIntegerDefault().size(); i++) { joiner.add(String.format("%sarray_integer_default%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(ApiClient.valueToString(getArrayIntegerDefault().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(ApiClient.valueToString(getArrayIntegerDefault().get(i))))); } } @@ -540,7 +540,7 @@ public class DefaultValue { for (int i = 0; i < getArrayString().size(); i++) { joiner.add(String.format("%sarray_string%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(ApiClient.valueToString(getArrayString().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(ApiClient.valueToString(getArrayString().get(i))))); } } @@ -549,7 +549,7 @@ public class DefaultValue { for (int i = 0; i < getArrayStringNullable().size(); i++) { joiner.add(String.format("%sarray_string_nullable%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(ApiClient.valueToString(getArrayStringNullable().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(ApiClient.valueToString(getArrayStringNullable().get(i))))); } } @@ -558,13 +558,13 @@ public class DefaultValue { for (int i = 0; i < getArrayStringExtensionNullable().size(); i++) { joiner.add(String.format("%sarray_string_extension_nullable%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(ApiClient.valueToString(getArrayStringExtensionNullable().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(ApiClient.valueToString(getArrayStringExtensionNullable().get(i))))); } } // add `string_nullable` to the URL query string if (getStringNullable() != null) { - joiner.add(String.format("%sstring_nullable%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getStringNullable()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sstring_nullable%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getStringNullable())))); } return joiner.toString(); diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java index 7d517683811..bc948b60acd 100644 --- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java +++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java @@ -207,17 +207,17 @@ public class NumberPropertiesOnly { // add `number` to the URL query string if (getNumber() != null) { - joiner.add(String.format("%snumber%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getNumber()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%snumber%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getNumber())))); } // add `float` to the URL query string if (getFloat() != null) { - joiner.add(String.format("%sfloat%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getFloat()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sfloat%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getFloat())))); } // add `double` to the URL query string if (getDouble() != null) { - joiner.add(String.format("%sdouble%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getDouble()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sdouble%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getDouble())))); } return joiner.toString(); diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Pet.java index 06ca6aab3fe..79aa7d71d9c 100644 --- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Pet.java @@ -354,12 +354,12 @@ public class Pet { // add `id` to the URL query string if (getId() != null) { - joiner.add(String.format("%sid%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getId()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sid%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getId())))); } // add `name` to the URL query string if (getName() != null) { - joiner.add(String.format("%sname%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sname%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getName())))); } // add `category` to the URL query string @@ -372,7 +372,7 @@ public class Pet { for (int i = 0; i < getPhotoUrls().size(); i++) { joiner.add(String.format("%sphotoUrls%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(ApiClient.valueToString(getPhotoUrls().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(ApiClient.valueToString(getPhotoUrls().get(i))))); } } @@ -388,7 +388,7 @@ public class Pet { // add `status` to the URL query string if (getStatus() != null) { - joiner.add(String.format("%sstatus%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getStatus()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sstatus%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getStatus())))); } return joiner.toString(); diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Query.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Query.java index 553140e167d..e1672ec2a6e 100644 --- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Query.java +++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Query.java @@ -220,7 +220,7 @@ public class Query { // add `id` to the URL query string if (getId() != null) { - joiner.add(String.format("%sid%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getId()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sid%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getId())))); } // add `outcomes` to the URL query string @@ -228,7 +228,7 @@ public class Query { for (int i = 0; i < getOutcomes().size(); i++) { joiner.add(String.format("%soutcomes%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(ApiClient.valueToString(getOutcomes().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(ApiClient.valueToString(getOutcomes().get(i))))); } } diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Tag.java index f7310c385a0..60b38d5c8eb 100644 --- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Tag.java +++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Tag.java @@ -173,12 +173,12 @@ public class Tag { // add `id` to the URL query string if (getId() != null) { - joiner.add(String.format("%sid%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getId()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sid%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getId())))); } // add `name` to the URL query string if (getName() != null) { - joiner.add(String.format("%sname%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sname%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getName())))); } return joiner.toString(); diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarker.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarker.java index 2de811b022f..7e3d011c00d 100644 --- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarker.java +++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarker.java @@ -142,7 +142,7 @@ public class TestFormObjectMultipartRequestMarker { // add `name` to the URL query string if (getName() != null) { - joiner.add(String.format("%sname%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sname%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getName())))); } return joiner.toString(); diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java index 4c161e77f82..8213dde9324 100644 --- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java +++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java @@ -235,22 +235,22 @@ public class TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter // add `size` to the URL query string if (getSize() != null) { - joiner.add(String.format("%ssize%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getSize()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%ssize%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getSize())))); } // add `color` to the URL query string if (getColor() != null) { - joiner.add(String.format("%scolor%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getColor()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%scolor%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getColor())))); } // add `id` to the URL query string if (getId() != null) { - joiner.add(String.format("%sid%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getId()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sid%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getId())))); } // add `name` to the URL query string if (getName() != null) { - joiner.add(String.format("%sname%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sname%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getName())))); } return joiner.toString(); diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java index b4a6d2a3199..d648ee8e703 100644 --- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java +++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java @@ -155,7 +155,7 @@ public class TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter { for (int i = 0; i < getValues().size(); i++) { joiner.add(String.format("%svalues%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(ApiClient.valueToString(getValues().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(ApiClient.valueToString(getValues().get(i))))); } } diff --git a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/Configuration.java b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/Configuration.java index 5d904566a76..dc3549ea5a1 100644 --- a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/Configuration.java +++ b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/Configuration.java @@ -17,7 +17,7 @@ package org.openapitools.client; public class Configuration { public static final String VERSION = "1.0.0"; - private static ApiClient defaultApiClient = new ApiClient(); + private static volatile ApiClient defaultApiClient = new ApiClient(); /** * Get the default API client, which would be used when creating API diff --git a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/Configuration.java b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/Configuration.java index 6c53ce74d86..2fffb41c5da 100644 --- a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/Configuration.java +++ b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/Configuration.java @@ -17,7 +17,7 @@ package org.openapitools.client; public class Configuration { public static final String VERSION = "0.1.0"; - private static ApiClient defaultApiClient = new ApiClient(); + private static volatile ApiClient defaultApiClient = new ApiClient(); /** * Get the default API client, which would be used when creating API diff --git a/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/Configuration.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/Configuration.java index 6c53ce74d86..2fffb41c5da 100644 --- a/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/Configuration.java +++ b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/Configuration.java @@ -17,7 +17,7 @@ package org.openapitools.client; public class Configuration { public static final String VERSION = "0.1.0"; - private static ApiClient defaultApiClient = new ApiClient(); + private static volatile ApiClient defaultApiClient = new ApiClient(); /** * Get the default API client, which would be used when creating API diff --git a/samples/client/others/java/jersey2-oneOf-Mixed/src/main/java/org/openapitools/client/Configuration.java b/samples/client/others/java/jersey2-oneOf-Mixed/src/main/java/org/openapitools/client/Configuration.java index 3f77a82bd30..c3023bcc5ef 100644 --- a/samples/client/others/java/jersey2-oneOf-Mixed/src/main/java/org/openapitools/client/Configuration.java +++ b/samples/client/others/java/jersey2-oneOf-Mixed/src/main/java/org/openapitools/client/Configuration.java @@ -17,7 +17,7 @@ package org.openapitools.client; public class Configuration { public static final String VERSION = "1.0.0"; - private static ApiClient defaultApiClient = new ApiClient(); + private static volatile ApiClient defaultApiClient = new ApiClient(); /** * Get the default API client, which would be used when creating API diff --git a/samples/client/others/java/jersey2-oneOf-duplicates/src/main/java/org/openapitools/client/Configuration.java b/samples/client/others/java/jersey2-oneOf-duplicates/src/main/java/org/openapitools/client/Configuration.java index 3f77a82bd30..c3023bcc5ef 100644 --- a/samples/client/others/java/jersey2-oneOf-duplicates/src/main/java/org/openapitools/client/Configuration.java +++ b/samples/client/others/java/jersey2-oneOf-duplicates/src/main/java/org/openapitools/client/Configuration.java @@ -17,7 +17,7 @@ package org.openapitools.client; public class Configuration { public static final String VERSION = "1.0.0"; - private static ApiClient defaultApiClient = new ApiClient(); + private static volatile ApiClient defaultApiClient = new ApiClient(); /** * Get the default API client, which would be used when creating API diff --git a/samples/client/others/java/okhttp-gson-oneOf-array/src/main/java/org/openapitools/client/Configuration.java b/samples/client/others/java/okhttp-gson-oneOf-array/src/main/java/org/openapitools/client/Configuration.java index 5f55a1dd0f8..13bfc331f32 100644 --- a/samples/client/others/java/okhttp-gson-oneOf-array/src/main/java/org/openapitools/client/Configuration.java +++ b/samples/client/others/java/okhttp-gson-oneOf-array/src/main/java/org/openapitools/client/Configuration.java @@ -17,7 +17,7 @@ package org.openapitools.client; public class Configuration { public static final String VERSION = "1.0.0"; - private static ApiClient defaultApiClient = new ApiClient(); + private static volatile ApiClient defaultApiClient = new ApiClient(); /** * Get the default API client, which would be used when creating API diff --git a/samples/client/others/java/okhttp-gson-oneOf/src/main/java/org/openapitools/client/Configuration.java b/samples/client/others/java/okhttp-gson-oneOf/src/main/java/org/openapitools/client/Configuration.java index 16bf159e8d3..e91ed76585f 100644 --- a/samples/client/others/java/okhttp-gson-oneOf/src/main/java/org/openapitools/client/Configuration.java +++ b/samples/client/others/java/okhttp-gson-oneOf/src/main/java/org/openapitools/client/Configuration.java @@ -17,7 +17,7 @@ package org.openapitools.client; public class Configuration { public static final String VERSION = "1.0.0"; - private static ApiClient defaultApiClient = new ApiClient(); + private static volatile ApiClient defaultApiClient = new ApiClient(); /** * Get the default API client, which would be used when creating API diff --git a/samples/client/others/java/okhttp-gson-streaming/src/main/java/org/openapitools/client/Configuration.java b/samples/client/others/java/okhttp-gson-streaming/src/main/java/org/openapitools/client/Configuration.java index fa579b757f8..be579f9ceb4 100644 --- a/samples/client/others/java/okhttp-gson-streaming/src/main/java/org/openapitools/client/Configuration.java +++ b/samples/client/others/java/okhttp-gson-streaming/src/main/java/org/openapitools/client/Configuration.java @@ -17,7 +17,7 @@ package org.openapitools.client; public class Configuration { public static final String VERSION = "1.0"; - private static ApiClient defaultApiClient = new ApiClient(); + private static volatile ApiClient defaultApiClient = new ApiClient(); /** * Get the default API client, which would be used when creating API diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/Configuration.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/Configuration.java index 5e90f7ca1d5..8001c410264 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/Configuration.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/Configuration.java @@ -17,7 +17,7 @@ package org.openapitools.client; public class Configuration { public static final String VERSION = "1.0.0"; - private static ApiClient defaultApiClient = new ApiClient(); + private static volatile ApiClient defaultApiClient = new ApiClient(); /** * Get the default API client, which would be used when creating API diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/Configuration.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/Configuration.java index 5e90f7ca1d5..8001c410264 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/Configuration.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/Configuration.java @@ -17,7 +17,7 @@ package org.openapitools.client; public class Configuration { public static final String VERSION = "1.0.0"; - private static ApiClient defaultApiClient = new ApiClient(); + private static volatile ApiClient defaultApiClient = new ApiClient(); /** * Get the default API client, which would be used when creating API diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/Configuration.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/Configuration.java index 5e90f7ca1d5..8001c410264 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/Configuration.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/Configuration.java @@ -17,7 +17,7 @@ package org.openapitools.client; public class Configuration { public static final String VERSION = "1.0.0"; - private static ApiClient defaultApiClient = new ApiClient(); + private static volatile ApiClient defaultApiClient = new ApiClient(); /** * Get the default API client, which would be used when creating API diff --git a/samples/client/petstore/java/jersey3-oneOf/src/main/java/org/openapitools/client/Configuration.java b/samples/client/petstore/java/jersey3-oneOf/src/main/java/org/openapitools/client/Configuration.java index bffc55678a3..0a431a2e532 100644 --- a/samples/client/petstore/java/jersey3-oneOf/src/main/java/org/openapitools/client/Configuration.java +++ b/samples/client/petstore/java/jersey3-oneOf/src/main/java/org/openapitools/client/Configuration.java @@ -17,7 +17,7 @@ package org.openapitools.client; public class Configuration { public static final String VERSION = "1.0.0"; - private static ApiClient defaultApiClient = new ApiClient(); + private static volatile ApiClient defaultApiClient = new ApiClient(); /** * Get the default API client, which would be used when creating API diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/Configuration.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/Configuration.java index 14b18d029a6..67195f8608a 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/Configuration.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/Configuration.java @@ -17,7 +17,7 @@ package org.openapitools.client; public class Configuration { public static final String VERSION = "1.0.0"; - private static ApiClient defaultApiClient = new ApiClient(); + private static volatile ApiClient defaultApiClient = new ApiClient(); /** * Get the default API client, which would be used when creating API diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/Configuration.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/Configuration.java index 5e90f7ca1d5..8001c410264 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/Configuration.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/Configuration.java @@ -17,7 +17,7 @@ package org.openapitools.client; public class Configuration { public static final String VERSION = "1.0.0"; - private static ApiClient defaultApiClient = new ApiClient(); + private static volatile ApiClient defaultApiClient = new ApiClient(); /** * Get the default API client, which would be used when creating API diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/AnotherFakeApi.java index 73b2645a1b2..229bde3f5fd 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/AnotherFakeApi.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/AnotherFakeApi.java @@ -15,6 +15,7 @@ package org.openapitools.client.api; import org.openapitools.client.ApiClient; import org.openapitools.client.ApiException; import org.openapitools.client.ApiResponse; +import org.openapitools.client.Configuration; import org.openapitools.client.Pair; import org.openapitools.client.model.Client; @@ -57,7 +58,7 @@ public class AnotherFakeApi { private final Consumer> memberVarAsyncResponseInterceptor; public AnotherFakeApi() { - this(new ApiClient()); + this(Configuration.getDefaultApiClient()); } public AnotherFakeApi(ApiClient apiClient) { diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/DefaultApi.java index 5961002e550..0eb2fb9b992 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/DefaultApi.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/DefaultApi.java @@ -15,6 +15,7 @@ package org.openapitools.client.api; import org.openapitools.client.ApiClient; import org.openapitools.client.ApiException; import org.openapitools.client.ApiResponse; +import org.openapitools.client.Configuration; import org.openapitools.client.Pair; import org.openapitools.client.model.FooGetDefaultResponse; @@ -57,7 +58,7 @@ public class DefaultApi { private final Consumer> memberVarAsyncResponseInterceptor; public DefaultApi() { - this(new ApiClient()); + this(Configuration.getDefaultApiClient()); } public DefaultApi(ApiClient apiClient) { diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java index d8fda783cf5..56bfe84015a 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java @@ -15,6 +15,7 @@ package org.openapitools.client.api; import org.openapitools.client.ApiClient; import org.openapitools.client.ApiException; import org.openapitools.client.ApiResponse; +import org.openapitools.client.Configuration; import org.openapitools.client.Pair; import java.math.BigDecimal; @@ -74,7 +75,7 @@ public class FakeApi { private final Consumer> memberVarAsyncResponseInterceptor; public FakeApi() { - this(new ApiClient()); + this(Configuration.getDefaultApiClient()); } public FakeApi(ApiClient apiClient) { diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java index 1766572438f..22a3efb4a6d 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java @@ -15,6 +15,7 @@ package org.openapitools.client.api; import org.openapitools.client.ApiClient; import org.openapitools.client.ApiException; import org.openapitools.client.ApiResponse; +import org.openapitools.client.Configuration; import org.openapitools.client.Pair; import org.openapitools.client.model.Client; @@ -63,7 +64,7 @@ public class FakeClassnameTags123Api { private final Consumer> memberVarAsyncResponseInterceptor; public FakeClassnameTags123Api() { - this(new ApiClient()); + this(Configuration.getDefaultApiClient()); } public FakeClassnameTags123Api(ApiClient apiClient) { diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java index 81b7bdcf820..3f3c79f2f10 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java @@ -15,6 +15,7 @@ package org.openapitools.client.api; import org.openapitools.client.ApiClient; import org.openapitools.client.ApiException; import org.openapitools.client.ApiResponse; +import org.openapitools.client.Configuration; import org.openapitools.client.Pair; import java.io.File; @@ -65,7 +66,7 @@ public class PetApi { private final Consumer> memberVarAsyncResponseInterceptor; public PetApi() { - this(new ApiClient()); + this(Configuration.getDefaultApiClient()); } public PetApi(ApiClient apiClient) { diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/StoreApi.java index 7697f5362a3..c03415827a1 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/StoreApi.java @@ -15,6 +15,7 @@ package org.openapitools.client.api; import org.openapitools.client.ApiClient; import org.openapitools.client.ApiException; import org.openapitools.client.ApiResponse; +import org.openapitools.client.Configuration; import org.openapitools.client.Pair; import org.openapitools.client.model.Order; @@ -63,7 +64,7 @@ public class StoreApi { private final Consumer> memberVarAsyncResponseInterceptor; public StoreApi() { - this(new ApiClient()); + this(Configuration.getDefaultApiClient()); } public StoreApi(ApiClient apiClient) { diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/UserApi.java index 664b8a74642..65dd0bb4f0a 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/UserApi.java @@ -15,6 +15,7 @@ package org.openapitools.client.api; import org.openapitools.client.ApiClient; import org.openapitools.client.ApiException; import org.openapitools.client.ApiResponse; +import org.openapitools.client.Configuration; import org.openapitools.client.Pair; import java.time.OffsetDateTime; @@ -64,7 +65,7 @@ public class UserApi { private final Consumer> memberVarAsyncResponseInterceptor; public UserApi() { - this(new ApiClient()); + this(Configuration.getDefaultApiClient()); } public UserApi(ApiClient apiClient) { diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index 4a7ed55edce..b37f89fca66 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -418,7 +418,7 @@ public class AdditionalPropertiesClass { for (String _key : getMapProperty().keySet()) { joiner.add(String.format("%smap_property%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix), - getMapProperty().get(_key), URLEncoder.encode(ApiClient.valueToString(getMapProperty().get(_key)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + getMapProperty().get(_key), ApiClient.urlEncode(ApiClient.valueToString(getMapProperty().get(_key))))); } } @@ -427,23 +427,23 @@ public class AdditionalPropertiesClass { for (String _key : getMapOfMapProperty().keySet()) { joiner.add(String.format("%smap_of_map_property%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix), - getMapOfMapProperty().get(_key), URLEncoder.encode(ApiClient.valueToString(getMapOfMapProperty().get(_key)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + getMapOfMapProperty().get(_key), ApiClient.urlEncode(ApiClient.valueToString(getMapOfMapProperty().get(_key))))); } } // add `anytype_1` to the URL query string if (getAnytype1() != null) { - joiner.add(String.format("%sanytype_1%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getAnytype1()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sanytype_1%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAnytype1())))); } // add `map_with_undeclared_properties_anytype_1` to the URL query string if (getMapWithUndeclaredPropertiesAnytype1() != null) { - joiner.add(String.format("%smap_with_undeclared_properties_anytype_1%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getMapWithUndeclaredPropertiesAnytype1()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%smap_with_undeclared_properties_anytype_1%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getMapWithUndeclaredPropertiesAnytype1())))); } // add `map_with_undeclared_properties_anytype_2` to the URL query string if (getMapWithUndeclaredPropertiesAnytype2() != null) { - joiner.add(String.format("%smap_with_undeclared_properties_anytype_2%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getMapWithUndeclaredPropertiesAnytype2()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%smap_with_undeclared_properties_anytype_2%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getMapWithUndeclaredPropertiesAnytype2())))); } // add `map_with_undeclared_properties_anytype_3` to the URL query string @@ -451,13 +451,13 @@ public class AdditionalPropertiesClass { for (String _key : getMapWithUndeclaredPropertiesAnytype3().keySet()) { joiner.add(String.format("%smap_with_undeclared_properties_anytype_3%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix), - getMapWithUndeclaredPropertiesAnytype3().get(_key), URLEncoder.encode(ApiClient.valueToString(getMapWithUndeclaredPropertiesAnytype3().get(_key)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + getMapWithUndeclaredPropertiesAnytype3().get(_key), ApiClient.urlEncode(ApiClient.valueToString(getMapWithUndeclaredPropertiesAnytype3().get(_key))))); } } // add `empty_map` to the URL query string if (getEmptyMap() != null) { - joiner.add(String.format("%sempty_map%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getEmptyMap()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sempty_map%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getEmptyMap())))); } // add `map_with_undeclared_properties_string` to the URL query string @@ -465,7 +465,7 @@ public class AdditionalPropertiesClass { for (String _key : getMapWithUndeclaredPropertiesString().keySet()) { joiner.add(String.format("%smap_with_undeclared_properties_string%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix), - getMapWithUndeclaredPropertiesString().get(_key), URLEncoder.encode(ApiClient.valueToString(getMapWithUndeclaredPropertiesString().get(_key)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + getMapWithUndeclaredPropertiesString().get(_key), ApiClient.urlEncode(ApiClient.valueToString(getMapWithUndeclaredPropertiesString().get(_key))))); } } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Animal.java index cc2c8977d18..e003139b7c2 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Animal.java @@ -187,12 +187,12 @@ public class Animal { // add `className` to the URL query string if (getClassName() != null) { - joiner.add(String.format("%sclassName%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getClassName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sclassName%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getClassName())))); } // add `color` to the URL query string if (getColor() != null) { - joiner.add(String.format("%scolor%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getColor()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%scolor%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getColor())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Apple.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Apple.java index 7dd3de4c65b..a90c882fda8 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Apple.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Apple.java @@ -173,12 +173,12 @@ public class Apple { // add `cultivar` to the URL query string if (getCultivar() != null) { - joiner.add(String.format("%scultivar%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getCultivar()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%scultivar%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getCultivar())))); } // add `origin` to the URL query string if (getOrigin() != null) { - joiner.add(String.format("%sorigin%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getOrigin()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sorigin%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getOrigin())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AppleReq.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AppleReq.java index 642968304dd..24bf8e3c390 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AppleReq.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AppleReq.java @@ -173,12 +173,12 @@ public class AppleReq { // add `cultivar` to the URL query string if (getCultivar() != null) { - joiner.add(String.format("%scultivar%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getCultivar()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%scultivar%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getCultivar())))); } // add `mealy` to the URL query string if (getMealy() != null) { - joiner.add(String.format("%smealy%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getMealy()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%smealy%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getMealy())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 7bede0326bc..a95da602ed8 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -157,7 +157,7 @@ public class ArrayOfArrayOfNumberOnly { if (getArrayArrayNumber().get(i) != null) { joiner.add(String.format("%sArrayArrayNumber%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(ApiClient.valueToString(getArrayArrayNumber().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(ApiClient.valueToString(getArrayArrayNumber().get(i))))); } } } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 91709a5f6b3..852ee7a0cdd 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -157,7 +157,7 @@ public class ArrayOfNumberOnly { if (getArrayNumber().get(i) != null) { joiner.add(String.format("%sArrayNumber%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(ApiClient.valueToString(getArrayNumber().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(ApiClient.valueToString(getArrayNumber().get(i))))); } } } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayTest.java index 89615d9416c..c8ebfa796c3 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -234,7 +234,7 @@ public class ArrayTest { for (int i = 0; i < getArrayOfString().size(); i++) { joiner.add(String.format("%sarray_of_string%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(ApiClient.valueToString(getArrayOfString().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(ApiClient.valueToString(getArrayOfString().get(i))))); } } @@ -243,7 +243,7 @@ public class ArrayTest { for (int i = 0; i < getArrayArrayOfInteger().size(); i++) { joiner.add(String.format("%sarray_array_of_integer%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(ApiClient.valueToString(getArrayArrayOfInteger().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(ApiClient.valueToString(getArrayArrayOfInteger().get(i))))); } } @@ -253,7 +253,7 @@ public class ArrayTest { if (getArrayArrayOfModel().get(i) != null) { joiner.add(String.format("%sarray_array_of_model%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(ApiClient.valueToString(getArrayArrayOfModel().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(ApiClient.valueToString(getArrayArrayOfModel().get(i))))); } } } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Banana.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Banana.java index b50986f0d78..09aed649893 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Banana.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Banana.java @@ -143,7 +143,7 @@ public class Banana { // add `lengthCm` to the URL query string if (getLengthCm() != null) { - joiner.add(String.format("%slengthCm%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getLengthCm()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%slengthCm%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getLengthCm())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/BananaReq.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/BananaReq.java index b320cb5b04d..3b74061210d 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/BananaReq.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/BananaReq.java @@ -174,12 +174,12 @@ public class BananaReq { // add `lengthCm` to the URL query string if (getLengthCm() != null) { - joiner.add(String.format("%slengthCm%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getLengthCm()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%slengthCm%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getLengthCm())))); } // add `sweet` to the URL query string if (getSweet() != null) { - joiner.add(String.format("%ssweet%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getSweet()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%ssweet%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getSweet())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/BasquePig.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/BasquePig.java index 300e0820b9f..e407b5aba26 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/BasquePig.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/BasquePig.java @@ -142,7 +142,7 @@ public class BasquePig { // add `className` to the URL query string if (getClassName() != null) { - joiner.add(String.format("%sclassName%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getClassName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sclassName%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getClassName())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Capitalization.java index 94e65b7bb50..3a44f057e9e 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Capitalization.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Capitalization.java @@ -297,32 +297,32 @@ public class Capitalization { // add `smallCamel` to the URL query string if (getSmallCamel() != null) { - joiner.add(String.format("%ssmallCamel%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getSmallCamel()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%ssmallCamel%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getSmallCamel())))); } // add `CapitalCamel` to the URL query string if (getCapitalCamel() != null) { - joiner.add(String.format("%sCapitalCamel%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getCapitalCamel()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sCapitalCamel%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getCapitalCamel())))); } // add `small_Snake` to the URL query string if (getSmallSnake() != null) { - joiner.add(String.format("%ssmall_Snake%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getSmallSnake()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%ssmall_Snake%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getSmallSnake())))); } // add `Capital_Snake` to the URL query string if (getCapitalSnake() != null) { - joiner.add(String.format("%sCapital_Snake%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getCapitalSnake()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sCapital_Snake%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getCapitalSnake())))); } // add `SCA_ETH_Flow_Points` to the URL query string if (getScAETHFlowPoints() != null) { - joiner.add(String.format("%sSCA_ETH_Flow_Points%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getScAETHFlowPoints()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sSCA_ETH_Flow_Points%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getScAETHFlowPoints())))); } // add `ATT_NAME` to the URL query string if (getATTNAME() != null) { - joiner.add(String.format("%sATT_NAME%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getATTNAME()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sATT_NAME%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getATTNAME())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Cat.java index 83b60c76d72..7fa1583efcd 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Cat.java @@ -168,17 +168,17 @@ public class Cat extends Animal { // add `className` to the URL query string if (getClassName() != null) { - joiner.add(String.format("%sclassName%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getClassName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sclassName%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getClassName())))); } // add `color` to the URL query string if (getColor() != null) { - joiner.add(String.format("%scolor%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getColor()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%scolor%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getColor())))); } // add `declawed` to the URL query string if (getDeclawed() != null) { - joiner.add(String.format("%sdeclawed%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getDeclawed()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sdeclawed%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getDeclawed())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Category.java index dcd5e053d14..5f8c92921b0 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Category.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Category.java @@ -173,12 +173,12 @@ public class Category { // add `id` to the URL query string if (getId() != null) { - joiner.add(String.format("%sid%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getId()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sid%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getId())))); } // add `name` to the URL query string if (getName() != null) { - joiner.add(String.format("%sname%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sname%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getName())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ChildCat.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ChildCat.java index 7d515946ec5..55841cc3a0a 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ChildCat.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ChildCat.java @@ -200,12 +200,12 @@ public class ChildCat extends ParentPet { // add `pet_type` to the URL query string if (getPetType() != null) { - joiner.add(String.format("%spet_type%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getPetType()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%spet_type%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getPetType())))); } // add `name` to the URL query string if (getName() != null) { - joiner.add(String.format("%sname%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sname%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getName())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ClassModel.java index 882c3c31d21..517c402ba21 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ClassModel.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ClassModel.java @@ -142,7 +142,7 @@ public class ClassModel { // add `_class` to the URL query string if (getPropertyClass() != null) { - joiner.add(String.format("%s_class%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getPropertyClass()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%s_class%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getPropertyClass())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Client.java index 6c39379214b..1af8e63784b 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Client.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Client.java @@ -142,7 +142,7 @@ public class Client { // add `client` to the URL query string if (getClient() != null) { - joiner.add(String.format("%sclient%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getClient()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sclient%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getClient())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java index 60f326bbd54..2b6ebf5a3ae 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java @@ -173,12 +173,12 @@ public class ComplexQuadrilateral { // add `shapeType` to the URL query string if (getShapeType() != null) { - joiner.add(String.format("%sshapeType%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getShapeType()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sshapeType%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getShapeType())))); } // add `quadrilateralType` to the URL query string if (getQuadrilateralType() != null) { - joiner.add(String.format("%squadrilateralType%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getQuadrilateralType()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%squadrilateralType%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getQuadrilateralType())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/DanishPig.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/DanishPig.java index 91a501744af..0d433d2705b 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/DanishPig.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/DanishPig.java @@ -142,7 +142,7 @@ public class DanishPig { // add `className` to the URL query string if (getClassName() != null) { - joiner.add(String.format("%sclassName%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getClassName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sclassName%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getClassName())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/DeprecatedObject.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/DeprecatedObject.java index 2d6021c3cc6..d58b4a6b7ff 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/DeprecatedObject.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/DeprecatedObject.java @@ -144,7 +144,7 @@ public class DeprecatedObject { // add `name` to the URL query string if (getName() != null) { - joiner.add(String.format("%sname%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sname%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getName())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Dog.java index edce47e1d64..5d019e4b8d6 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Dog.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Dog.java @@ -167,17 +167,17 @@ public class Dog extends Animal { // add `className` to the URL query string if (getClassName() != null) { - joiner.add(String.format("%sclassName%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getClassName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sclassName%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getClassName())))); } // add `color` to the URL query string if (getColor() != null) { - joiner.add(String.format("%scolor%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getColor()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%scolor%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getColor())))); } // add `breed` to the URL query string if (getBreed() != null) { - joiner.add(String.format("%sbreed%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getBreed()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sbreed%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getBreed())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumArrays.java index f9318fbd1b6..64548dabd98 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -253,7 +253,7 @@ public class EnumArrays { // add `just_symbol` to the URL query string if (getJustSymbol() != null) { - joiner.add(String.format("%sjust_symbol%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getJustSymbol()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sjust_symbol%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getJustSymbol())))); } // add `array_enum` to the URL query string @@ -261,7 +261,7 @@ public class EnumArrays { for (int i = 0; i < getArrayEnum().size(); i++) { joiner.add(String.format("%sarray_enum%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(ApiClient.valueToString(getArrayEnum().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(ApiClient.valueToString(getArrayEnum().get(i))))); } } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumTest.java index 755d6bf1831..dbfbdda8861 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumTest.java @@ -595,47 +595,47 @@ public class EnumTest { // add `enum_string` to the URL query string if (getEnumString() != null) { - joiner.add(String.format("%senum_string%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getEnumString()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%senum_string%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getEnumString())))); } // add `enum_string_required` to the URL query string if (getEnumStringRequired() != null) { - joiner.add(String.format("%senum_string_required%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getEnumStringRequired()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%senum_string_required%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getEnumStringRequired())))); } // add `enum_integer` to the URL query string if (getEnumInteger() != null) { - joiner.add(String.format("%senum_integer%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getEnumInteger()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%senum_integer%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getEnumInteger())))); } // add `enum_integer_only` to the URL query string if (getEnumIntegerOnly() != null) { - joiner.add(String.format("%senum_integer_only%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getEnumIntegerOnly()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%senum_integer_only%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getEnumIntegerOnly())))); } // add `enum_number` to the URL query string if (getEnumNumber() != null) { - joiner.add(String.format("%senum_number%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getEnumNumber()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%senum_number%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getEnumNumber())))); } // add `outerEnum` to the URL query string if (getOuterEnum() != null) { - joiner.add(String.format("%souterEnum%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getOuterEnum()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%souterEnum%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getOuterEnum())))); } // add `outerEnumInteger` to the URL query string if (getOuterEnumInteger() != null) { - joiner.add(String.format("%souterEnumInteger%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getOuterEnumInteger()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%souterEnumInteger%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getOuterEnumInteger())))); } // add `outerEnumDefaultValue` to the URL query string if (getOuterEnumDefaultValue() != null) { - joiner.add(String.format("%souterEnumDefaultValue%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getOuterEnumDefaultValue()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%souterEnumDefaultValue%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getOuterEnumDefaultValue())))); } // add `outerEnumIntegerDefaultValue` to the URL query string if (getOuterEnumIntegerDefaultValue() != null) { - joiner.add(String.format("%souterEnumIntegerDefaultValue%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getOuterEnumIntegerDefaultValue()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%souterEnumIntegerDefaultValue%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getOuterEnumIntegerDefaultValue())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EquilateralTriangle.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EquilateralTriangle.java index d4cd4c93c61..ac24752c9ec 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EquilateralTriangle.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EquilateralTriangle.java @@ -173,12 +173,12 @@ public class EquilateralTriangle { // add `shapeType` to the URL query string if (getShapeType() != null) { - joiner.add(String.format("%sshapeType%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getShapeType()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sshapeType%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getShapeType())))); } // add `triangleType` to the URL query string if (getTriangleType() != null) { - joiner.add(String.format("%striangleType%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getTriangleType()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%striangleType%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getTriangleType())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java index 92b83acc2b3..df180702617 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java @@ -184,7 +184,7 @@ public class FakeBigDecimalMap200Response { // add `someId` to the URL query string if (getSomeId() != null) { - joiner.add(String.format("%ssomeId%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getSomeId()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%ssomeId%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getSomeId())))); } // add `someMap` to the URL query string @@ -192,7 +192,7 @@ public class FakeBigDecimalMap200Response { for (String _key : getSomeMap().keySet()) { joiner.add(String.format("%ssomeMap%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix), - getSomeMap().get(_key), URLEncoder.encode(ApiClient.valueToString(getSomeMap().get(_key)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + getSomeMap().get(_key), ApiClient.urlEncode(ApiClient.valueToString(getSomeMap().get(_key))))); } } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Foo.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Foo.java index e4f80ccc1e4..9f29f1f521e 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Foo.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Foo.java @@ -142,7 +142,7 @@ public class Foo { // add `bar` to the URL query string if (getBar() != null) { - joiner.add(String.format("%sbar%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getBar()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sbar%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getBar())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FormatTest.java index 20c1e8ba345..56116170871 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FormatTest.java @@ -622,82 +622,82 @@ public class FormatTest { // add `integer` to the URL query string if (getInteger() != null) { - joiner.add(String.format("%sinteger%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getInteger()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sinteger%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getInteger())))); } // add `int32` to the URL query string if (getInt32() != null) { - joiner.add(String.format("%sint32%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getInt32()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sint32%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getInt32())))); } // add `int64` to the URL query string if (getInt64() != null) { - joiner.add(String.format("%sint64%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getInt64()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sint64%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getInt64())))); } // add `number` to the URL query string if (getNumber() != null) { - joiner.add(String.format("%snumber%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getNumber()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%snumber%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getNumber())))); } // add `float` to the URL query string if (getFloat() != null) { - joiner.add(String.format("%sfloat%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getFloat()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sfloat%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getFloat())))); } // add `double` to the URL query string if (getDouble() != null) { - joiner.add(String.format("%sdouble%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getDouble()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sdouble%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getDouble())))); } // add `decimal` to the URL query string if (getDecimal() != null) { - joiner.add(String.format("%sdecimal%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getDecimal()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sdecimal%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getDecimal())))); } // add `string` to the URL query string if (getString() != null) { - joiner.add(String.format("%sstring%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getString()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sstring%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getString())))); } // add `byte` to the URL query string if (getByte() != null) { - joiner.add(String.format("%sbyte%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getByte()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sbyte%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getByte())))); } // add `binary` to the URL query string if (getBinary() != null) { - joiner.add(String.format("%sbinary%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getBinary()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sbinary%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getBinary())))); } // add `date` to the URL query string if (getDate() != null) { - joiner.add(String.format("%sdate%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getDate()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sdate%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getDate())))); } // add `dateTime` to the URL query string if (getDateTime() != null) { - joiner.add(String.format("%sdateTime%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getDateTime()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sdateTime%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getDateTime())))); } // add `uuid` to the URL query string if (getUuid() != null) { - joiner.add(String.format("%suuid%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getUuid()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%suuid%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getUuid())))); } // add `password` to the URL query string if (getPassword() != null) { - joiner.add(String.format("%spassword%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getPassword()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%spassword%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getPassword())))); } // add `pattern_with_digits` to the URL query string if (getPatternWithDigits() != null) { - joiner.add(String.format("%spattern_with_digits%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getPatternWithDigits()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%spattern_with_digits%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getPatternWithDigits())))); } // add `pattern_with_digits_and_delimiter` to the URL query string if (getPatternWithDigitsAndDelimiter() != null) { - joiner.add(String.format("%spattern_with_digits_and_delimiter%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getPatternWithDigitsAndDelimiter()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%spattern_with_digits_and_delimiter%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getPatternWithDigitsAndDelimiter())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Fruit.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Fruit.java index 358c5949f0a..ee99daeb8b1 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Fruit.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Fruit.java @@ -52,6 +52,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import com.fasterxml.jackson.databind.ser.std.StdSerializer; +import org.openapitools.client.ApiClient; import org.openapitools.client.JSON; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.12.0-SNAPSHOT") diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FruitReq.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FruitReq.java index 75e59e2883c..3068f1edd56 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FruitReq.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FruitReq.java @@ -52,6 +52,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import com.fasterxml.jackson.databind.ser.std.StdSerializer; +import org.openapitools.client.ApiClient; import org.openapitools.client.JSON; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.12.0-SNAPSHOT") diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/GmFruit.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/GmFruit.java index d68de9d37b3..74b65d77c48 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/GmFruit.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/GmFruit.java @@ -49,6 +49,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import com.fasterxml.jackson.databind.ser.std.StdSerializer; +import org.openapitools.client.ApiClient; import org.openapitools.client.JSON; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.12.0-SNAPSHOT") diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/GrandparentAnimal.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/GrandparentAnimal.java index dc5c80bb245..c1025bdbcc6 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/GrandparentAnimal.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/GrandparentAnimal.java @@ -156,7 +156,7 @@ public class GrandparentAnimal { // add `pet_type` to the URL query string if (getPetType() != null) { - joiner.add(String.format("%spet_type%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getPetType()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%spet_type%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getPetType())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java index 24837a57933..ecdcfc50100 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java @@ -163,12 +163,12 @@ public class HasOnlyReadOnly { // add `bar` to the URL query string if (getBar() != null) { - joiner.add(String.format("%sbar%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getBar()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sbar%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getBar())))); } // add `foo` to the URL query string if (getFoo() != null) { - joiner.add(String.format("%sfoo%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getFoo()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sfoo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getFoo())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/HealthCheckResult.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/HealthCheckResult.java index a7e97d0dcd9..890b8471c21 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/HealthCheckResult.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/HealthCheckResult.java @@ -164,7 +164,7 @@ public class HealthCheckResult { // add `NullableMessage` to the URL query string if (getNullableMessage() != null) { - joiner.add(String.format("%sNullableMessage%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getNullableMessage()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sNullableMessage%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getNullableMessage())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/IsoscelesTriangle.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/IsoscelesTriangle.java index 606f138a6d7..08741b18e1c 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/IsoscelesTriangle.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/IsoscelesTriangle.java @@ -173,12 +173,12 @@ public class IsoscelesTriangle { // add `shapeType` to the URL query string if (getShapeType() != null) { - joiner.add(String.format("%sshapeType%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getShapeType()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sshapeType%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getShapeType())))); } // add `triangleType` to the URL query string if (getTriangleType() != null) { - joiner.add(String.format("%striangleType%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getTriangleType()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%striangleType%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getTriangleType())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Mammal.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Mammal.java index d2927a6c71e..35adaab0fc4 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Mammal.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Mammal.java @@ -55,6 +55,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import com.fasterxml.jackson.databind.ser.std.StdSerializer; +import org.openapitools.client.ApiClient; import org.openapitools.client.JSON; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.12.0-SNAPSHOT") @@ -344,7 +345,7 @@ public class Mammal extends AbstractOpenApiSchema { } if (getActualInstance() instanceof Zebra) { if (getActualInstance() != null) { - joiner.add(String.format("%sone_of_1%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getActualInstance()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sone_of_1%s=%s", prefix, suffix, ApiClient.urlEncode(String.valueOf(getActualInstance())))); } return joiner.toString(); } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/MapTest.java index f8b0fe217a5..4845bd58e8e 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/MapTest.java @@ -307,7 +307,7 @@ public class MapTest { for (String _key : getMapMapOfString().keySet()) { joiner.add(String.format("%smap_map_of_string%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix), - getMapMapOfString().get(_key), URLEncoder.encode(ApiClient.valueToString(getMapMapOfString().get(_key)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + getMapMapOfString().get(_key), ApiClient.urlEncode(ApiClient.valueToString(getMapMapOfString().get(_key))))); } } @@ -316,7 +316,7 @@ public class MapTest { for (String _key : getMapOfEnumString().keySet()) { joiner.add(String.format("%smap_of_enum_string%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix), - getMapOfEnumString().get(_key), URLEncoder.encode(ApiClient.valueToString(getMapOfEnumString().get(_key)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + getMapOfEnumString().get(_key), ApiClient.urlEncode(ApiClient.valueToString(getMapOfEnumString().get(_key))))); } } @@ -325,7 +325,7 @@ public class MapTest { for (String _key : getDirectMap().keySet()) { joiner.add(String.format("%sdirect_map%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix), - getDirectMap().get(_key), URLEncoder.encode(ApiClient.valueToString(getDirectMap().get(_key)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + getDirectMap().get(_key), ApiClient.urlEncode(ApiClient.valueToString(getDirectMap().get(_key))))); } } @@ -334,7 +334,7 @@ public class MapTest { for (String _key : getIndirectMap().keySet()) { joiner.add(String.format("%sindirect_map%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix), - getIndirectMap().get(_key), URLEncoder.encode(ApiClient.valueToString(getIndirectMap().get(_key)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + getIndirectMap().get(_key), ApiClient.urlEncode(ApiClient.valueToString(getIndirectMap().get(_key))))); } } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 70293743fff..11eddcf72bf 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -217,12 +217,12 @@ public class MixedPropertiesAndAdditionalPropertiesClass { // add `uuid` to the URL query string if (getUuid() != null) { - joiner.add(String.format("%suuid%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getUuid()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%suuid%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getUuid())))); } // add `dateTime` to the URL query string if (getDateTime() != null) { - joiner.add(String.format("%sdateTime%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getDateTime()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sdateTime%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getDateTime())))); } // add `map` to the URL query string diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Model200Response.java index 41c25ab3c11..a07baa048f2 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Model200Response.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Model200Response.java @@ -173,12 +173,12 @@ public class Model200Response { // add `name` to the URL query string if (getName() != null) { - joiner.add(String.format("%sname%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sname%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getName())))); } // add `class` to the URL query string if (getPropertyClass() != null) { - joiner.add(String.format("%sclass%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getPropertyClass()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sclass%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getPropertyClass())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelApiResponse.java index 45a082c2a14..edafeba46ac 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelApiResponse.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelApiResponse.java @@ -204,17 +204,17 @@ public class ModelApiResponse { // add `code` to the URL query string if (getCode() != null) { - joiner.add(String.format("%scode%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getCode()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%scode%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getCode())))); } // add `type` to the URL query string if (getType() != null) { - joiner.add(String.format("%stype%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getType()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%stype%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getType())))); } // add `message` to the URL query string if (getMessage() != null) { - joiner.add(String.format("%smessage%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getMessage()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%smessage%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getMessage())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelFile.java index 274b1371ca9..833c7659eb4 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelFile.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelFile.java @@ -142,7 +142,7 @@ public class ModelFile { // add `sourceURI` to the URL query string if (getSourceURI() != null) { - joiner.add(String.format("%ssourceURI%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getSourceURI()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%ssourceURI%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getSourceURI())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelList.java index 570344c6522..0b00e97da60 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelList.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelList.java @@ -142,7 +142,7 @@ public class ModelList { // add `123-list` to the URL query string if (get123list() != null) { - joiner.add(String.format("%s123-list%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(get123list()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%s123-list%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(get123list())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelReturn.java index fbf550a0913..4b3f6e9e67a 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelReturn.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelReturn.java @@ -142,7 +142,7 @@ public class ModelReturn { // add `return` to the URL query string if (getReturn() != null) { - joiner.add(String.format("%sreturn%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getReturn()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sreturn%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getReturn())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Name.java index 93b63ccda60..9f5be547ae4 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Name.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Name.java @@ -225,22 +225,22 @@ public class Name { // add `name` to the URL query string if (getName() != null) { - joiner.add(String.format("%sname%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sname%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getName())))); } // add `snake_case` to the URL query string if (getSnakeCase() != null) { - joiner.add(String.format("%ssnake_case%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getSnakeCase()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%ssnake_case%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getSnakeCase())))); } // add `property` to the URL query string if (getProperty() != null) { - joiner.add(String.format("%sproperty%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getProperty()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sproperty%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getProperty())))); } // add `123Number` to the URL query string if (get123number() != null) { - joiner.add(String.format("%s123Number%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(get123number()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%s123Number%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(get123number())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NullableClass.java index ab1b5d0e01e..1c62d45d565 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NullableClass.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NullableClass.java @@ -690,32 +690,32 @@ public class NullableClass extends HashMap { // add `integer_prop` to the URL query string if (getIntegerProp() != null) { - joiner.add(String.format("%sinteger_prop%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getIntegerProp()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sinteger_prop%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getIntegerProp())))); } // add `number_prop` to the URL query string if (getNumberProp() != null) { - joiner.add(String.format("%snumber_prop%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getNumberProp()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%snumber_prop%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getNumberProp())))); } // add `boolean_prop` to the URL query string if (getBooleanProp() != null) { - joiner.add(String.format("%sboolean_prop%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getBooleanProp()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sboolean_prop%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getBooleanProp())))); } // add `string_prop` to the URL query string if (getStringProp() != null) { - joiner.add(String.format("%sstring_prop%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getStringProp()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sstring_prop%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getStringProp())))); } // add `date_prop` to the URL query string if (getDateProp() != null) { - joiner.add(String.format("%sdate_prop%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getDateProp()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sdate_prop%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getDateProp())))); } // add `datetime_prop` to the URL query string if (getDatetimeProp() != null) { - joiner.add(String.format("%sdatetime_prop%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getDatetimeProp()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sdatetime_prop%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getDatetimeProp())))); } // add `array_nullable_prop` to the URL query string @@ -723,7 +723,7 @@ public class NullableClass extends HashMap { for (int i = 0; i < getArrayNullableProp().size(); i++) { joiner.add(String.format("%sarray_nullable_prop%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(ApiClient.valueToString(getArrayNullableProp().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(ApiClient.valueToString(getArrayNullableProp().get(i))))); } } @@ -732,7 +732,7 @@ public class NullableClass extends HashMap { for (int i = 0; i < getArrayAndItemsNullableProp().size(); i++) { joiner.add(String.format("%sarray_and_items_nullable_prop%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(ApiClient.valueToString(getArrayAndItemsNullableProp().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(ApiClient.valueToString(getArrayAndItemsNullableProp().get(i))))); } } @@ -741,7 +741,7 @@ public class NullableClass extends HashMap { for (int i = 0; i < getArrayItemsNullable().size(); i++) { joiner.add(String.format("%sarray_items_nullable%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(ApiClient.valueToString(getArrayItemsNullable().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(ApiClient.valueToString(getArrayItemsNullable().get(i))))); } } @@ -750,7 +750,7 @@ public class NullableClass extends HashMap { for (String _key : getObjectNullableProp().keySet()) { joiner.add(String.format("%sobject_nullable_prop%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix), - getObjectNullableProp().get(_key), URLEncoder.encode(ApiClient.valueToString(getObjectNullableProp().get(_key)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + getObjectNullableProp().get(_key), ApiClient.urlEncode(ApiClient.valueToString(getObjectNullableProp().get(_key))))); } } @@ -759,7 +759,7 @@ public class NullableClass extends HashMap { for (String _key : getObjectAndItemsNullableProp().keySet()) { joiner.add(String.format("%sobject_and_items_nullable_prop%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix), - getObjectAndItemsNullableProp().get(_key), URLEncoder.encode(ApiClient.valueToString(getObjectAndItemsNullableProp().get(_key)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + getObjectAndItemsNullableProp().get(_key), ApiClient.urlEncode(ApiClient.valueToString(getObjectAndItemsNullableProp().get(_key))))); } } @@ -768,7 +768,7 @@ public class NullableClass extends HashMap { for (String _key : getObjectItemsNullable().keySet()) { joiner.add(String.format("%sobject_items_nullable%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix), - getObjectItemsNullable().get(_key), URLEncoder.encode(ApiClient.valueToString(getObjectItemsNullable().get(_key)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + getObjectItemsNullable().get(_key), ApiClient.urlEncode(ApiClient.valueToString(getObjectItemsNullable().get(_key))))); } } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NullableShape.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NullableShape.java index 231246d8742..2cf0c361383 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NullableShape.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NullableShape.java @@ -54,6 +54,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import com.fasterxml.jackson.databind.ser.std.StdSerializer; +import org.openapitools.client.ApiClient; import org.openapitools.client.JSON; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.12.0-SNAPSHOT") diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NumberOnly.java index 4d11dcff2f1..1fc72d6e210 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NumberOnly.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NumberOnly.java @@ -143,7 +143,7 @@ public class NumberOnly { // add `JustNumber` to the URL query string if (getJustNumber() != null) { - joiner.add(String.format("%sJustNumber%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getJustNumber()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sJustNumber%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getJustNumber())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java index 2f0401e9352..87776abe1c2 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java @@ -253,12 +253,12 @@ public class ObjectWithDeprecatedFields { // add `uuid` to the URL query string if (getUuid() != null) { - joiner.add(String.format("%suuid%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getUuid()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%suuid%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getUuid())))); } // add `id` to the URL query string if (getId() != null) { - joiner.add(String.format("%sid%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getId()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sid%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getId())))); } // add `deprecatedRef` to the URL query string @@ -271,7 +271,7 @@ public class ObjectWithDeprecatedFields { for (int i = 0; i < getBars().size(); i++) { joiner.add(String.format("%sbars%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(ApiClient.valueToString(getBars().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(ApiClient.valueToString(getBars().get(i))))); } } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Order.java index 0dfdeff908f..5f5fff779cd 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Order.java @@ -335,32 +335,32 @@ public class Order { // add `id` to the URL query string if (getId() != null) { - joiner.add(String.format("%sid%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getId()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sid%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getId())))); } // add `petId` to the URL query string if (getPetId() != null) { - joiner.add(String.format("%spetId%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getPetId()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%spetId%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getPetId())))); } // add `quantity` to the URL query string if (getQuantity() != null) { - joiner.add(String.format("%squantity%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getQuantity()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%squantity%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getQuantity())))); } // add `shipDate` to the URL query string if (getShipDate() != null) { - joiner.add(String.format("%sshipDate%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getShipDate()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sshipDate%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getShipDate())))); } // add `status` to the URL query string if (getStatus() != null) { - joiner.add(String.format("%sstatus%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getStatus()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sstatus%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getStatus())))); } // add `complete` to the URL query string if (getComplete() != null) { - joiner.add(String.format("%scomplete%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getComplete()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%scomplete%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getComplete())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/OuterComposite.java index 54b7b4f8266..a72fed4bfd8 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/OuterComposite.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/OuterComposite.java @@ -205,17 +205,17 @@ public class OuterComposite { // add `my_number` to the URL query string if (getMyNumber() != null) { - joiner.add(String.format("%smy_number%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getMyNumber()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%smy_number%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getMyNumber())))); } // add `my_string` to the URL query string if (getMyString() != null) { - joiner.add(String.format("%smy_string%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getMyString()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%smy_string%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getMyString())))); } // add `my_boolean` to the URL query string if (getMyBoolean() != null) { - joiner.add(String.format("%smy_boolean%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getMyBoolean()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%smy_boolean%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getMyBoolean())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ParentPet.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ParentPet.java index 2c435ec2e63..922894865d1 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ParentPet.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ParentPet.java @@ -132,7 +132,7 @@ public class ParentPet extends GrandparentAnimal { // add `pet_type` to the URL query string if (getPetType() != null) { - joiner.add(String.format("%spet_type%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getPetType()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%spet_type%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getPetType())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Pet.java index 8ca693f6cce..b75a4dee271 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Pet.java @@ -354,7 +354,7 @@ public class Pet { // add `id` to the URL query string if (getId() != null) { - joiner.add(String.format("%sid%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getId()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sid%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getId())))); } // add `category` to the URL query string @@ -364,7 +364,7 @@ public class Pet { // add `name` to the URL query string if (getName() != null) { - joiner.add(String.format("%sname%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sname%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getName())))); } // add `photoUrls` to the URL query string @@ -372,7 +372,7 @@ public class Pet { for (int i = 0; i < getPhotoUrls().size(); i++) { joiner.add(String.format("%sphotoUrls%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(ApiClient.valueToString(getPhotoUrls().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(ApiClient.valueToString(getPhotoUrls().get(i))))); } } @@ -388,7 +388,7 @@ public class Pet { // add `status` to the URL query string if (getStatus() != null) { - joiner.add(String.format("%sstatus%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getStatus()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sstatus%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getStatus())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Pig.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Pig.java index 36368587c6c..96defafd44d 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Pig.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Pig.java @@ -54,6 +54,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import com.fasterxml.jackson.databind.ser.std.StdSerializer; +import org.openapitools.client.ApiClient; import org.openapitools.client.JSON; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.12.0-SNAPSHOT") diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Quadrilateral.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Quadrilateral.java index fbc6949ef7b..3ed09be05a7 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Quadrilateral.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Quadrilateral.java @@ -54,6 +54,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import com.fasterxml.jackson.databind.ser.std.StdSerializer; +import org.openapitools.client.ApiClient; import org.openapitools.client.JSON; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.12.0-SNAPSHOT") diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java index 37a05d00034..aba0215bee5 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java @@ -142,7 +142,7 @@ public class QuadrilateralInterface { // add `quadrilateralType` to the URL query string if (getQuadrilateralType() != null) { - joiner.add(String.format("%squadrilateralType%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getQuadrilateralType()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%squadrilateralType%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getQuadrilateralType())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java index d15bcfc441d..aec80c64caf 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java @@ -171,12 +171,12 @@ public class ReadOnlyFirst { // add `bar` to the URL query string if (getBar() != null) { - joiner.add(String.format("%sbar%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getBar()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sbar%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getBar())))); } // add `baz` to the URL query string if (getBaz() != null) { - joiner.add(String.format("%sbaz%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getBaz()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sbaz%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getBaz())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ScaleneTriangle.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ScaleneTriangle.java index 2c6a2f9f7ab..7449db8cbe2 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ScaleneTriangle.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ScaleneTriangle.java @@ -173,12 +173,12 @@ public class ScaleneTriangle { // add `shapeType` to the URL query string if (getShapeType() != null) { - joiner.add(String.format("%sshapeType%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getShapeType()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sshapeType%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getShapeType())))); } // add `triangleType` to the URL query string if (getTriangleType() != null) { - joiner.add(String.format("%striangleType%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getTriangleType()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%striangleType%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getTriangleType())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Shape.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Shape.java index 8f325a41b9f..6390e70935a 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Shape.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Shape.java @@ -54,6 +54,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import com.fasterxml.jackson.databind.ser.std.StdSerializer; +import org.openapitools.client.ApiClient; import org.openapitools.client.JSON; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.12.0-SNAPSHOT") diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ShapeInterface.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ShapeInterface.java index f0e7e82723c..1a3450da1c1 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ShapeInterface.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ShapeInterface.java @@ -142,7 +142,7 @@ public class ShapeInterface { // add `shapeType` to the URL query string if (getShapeType() != null) { - joiner.add(String.format("%sshapeType%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getShapeType()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sshapeType%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getShapeType())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ShapeOrNull.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ShapeOrNull.java index c42febea4fa..6b6a2a87abe 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ShapeOrNull.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ShapeOrNull.java @@ -54,6 +54,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import com.fasterxml.jackson.databind.ser.std.StdSerializer; +import org.openapitools.client.ApiClient; import org.openapitools.client.JSON; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.12.0-SNAPSHOT") diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java index b3e08ec8f12..25ed4105bd8 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java @@ -173,12 +173,12 @@ public class SimpleQuadrilateral { // add `shapeType` to the URL query string if (getShapeType() != null) { - joiner.add(String.format("%sshapeType%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getShapeType()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sshapeType%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getShapeType())))); } // add `quadrilateralType` to the URL query string if (getQuadrilateralType() != null) { - joiner.add(String.format("%squadrilateralType%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getQuadrilateralType()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%squadrilateralType%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getQuadrilateralType())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/SpecialModelName.java index 9fa47e22e82..55b113a8e95 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/SpecialModelName.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/SpecialModelName.java @@ -173,12 +173,12 @@ public class SpecialModelName { // add `$special[property.name]` to the URL query string if (get$SpecialPropertyName() != null) { - joiner.add(String.format("%s$special[property.name]%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(get$SpecialPropertyName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%s$special[property.name]%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(get$SpecialPropertyName())))); } // add `_special_model.name_` to the URL query string if (getSpecialModelName() != null) { - joiner.add(String.format("%s_special_model.name_%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getSpecialModelName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%s_special_model.name_%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getSpecialModelName())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Tag.java index aae14adce41..97fec4a1497 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Tag.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Tag.java @@ -173,12 +173,12 @@ public class Tag { // add `id` to the URL query string if (getId() != null) { - joiner.add(String.format("%sid%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getId()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sid%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getId())))); } // add `name` to the URL query string if (getName() != null) { - joiner.add(String.format("%sname%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sname%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getName())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java index 3a8f1a07d94..95f005d746a 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java @@ -195,7 +195,7 @@ public class TestInlineFreeformAdditionalPropertiesRequest extends HashMap { // add `type` to the URL query string if (getType() != null) { - joiner.add(String.format("%stype%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getType()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%stype%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getType())))); } // add `className` to the URL query string if (getClassName() != null) { - joiner.add(String.format("%sclassName%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getClassName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sclassName%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getClassName())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/Configuration.java b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/Configuration.java index 32be78fabc5..9475d8ca836 100644 --- a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/Configuration.java +++ b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/Configuration.java @@ -17,7 +17,7 @@ package org.openapitools.client; public class Configuration { public static final String VERSION = "1.0.0"; - private static ApiClient defaultApiClient = new ApiClient(); + private static volatile ApiClient defaultApiClient = new ApiClient(); /** * Get the default API client, which would be used when creating API diff --git a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/PetApi.java index 511052b03b8..36c3a0e9348 100644 --- a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/PetApi.java @@ -15,6 +15,7 @@ package org.openapitools.client.api; import org.openapitools.client.ApiClient; import org.openapitools.client.ApiException; import org.openapitools.client.ApiResponse; +import org.openapitools.client.Configuration; import org.openapitools.client.Pair; import java.io.File; @@ -63,7 +64,7 @@ public class PetApi { private final Consumer> memberVarAsyncResponseInterceptor; public PetApi() { - this(new ApiClient()); + this(Configuration.getDefaultApiClient()); } public PetApi(ApiClient apiClient) { diff --git a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/StoreApi.java index 5565aacb88e..9876fa946da 100644 --- a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/StoreApi.java @@ -15,6 +15,7 @@ package org.openapitools.client.api; import org.openapitools.client.ApiClient; import org.openapitools.client.ApiException; import org.openapitools.client.ApiResponse; +import org.openapitools.client.Configuration; import org.openapitools.client.Pair; import org.openapitools.client.model.Order; @@ -61,7 +62,7 @@ public class StoreApi { private final Consumer> memberVarAsyncResponseInterceptor; public StoreApi() { - this(new ApiClient()); + this(Configuration.getDefaultApiClient()); } public StoreApi(ApiClient apiClient) { diff --git a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/UserApi.java index e997cb1ff3f..9fb7696298f 100644 --- a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/UserApi.java @@ -15,6 +15,7 @@ package org.openapitools.client.api; import org.openapitools.client.ApiClient; import org.openapitools.client.ApiException; import org.openapitools.client.ApiResponse; +import org.openapitools.client.Configuration; import org.openapitools.client.Pair; import java.time.OffsetDateTime; @@ -62,7 +63,7 @@ public class UserApi { private final Consumer> memberVarAsyncResponseInterceptor; public UserApi() { - this(new ApiClient()); + this(Configuration.getDefaultApiClient()); } public UserApi(ApiClient apiClient) { diff --git a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/Category.java index 96c617de18f..11c92c35fe6 100644 --- a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/Category.java +++ b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/Category.java @@ -173,12 +173,12 @@ public class Category { // add `id` to the URL query string if (getId() != null) { - joiner.add(String.format("%sid%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getId()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sid%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getId())))); } // add `name` to the URL query string if (getName() != null) { - joiner.add(String.format("%sname%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sname%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getName())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/ModelApiResponse.java index 939ccf6c689..747d3a8e625 100644 --- a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/ModelApiResponse.java +++ b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/ModelApiResponse.java @@ -204,17 +204,17 @@ public class ModelApiResponse { // add `code` to the URL query string if (getCode() != null) { - joiner.add(String.format("%scode%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getCode()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%scode%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getCode())))); } // add `type` to the URL query string if (getType() != null) { - joiner.add(String.format("%stype%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getType()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%stype%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getType())))); } // add `message` to the URL query string if (getMessage() != null) { - joiner.add(String.format("%smessage%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getMessage()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%smessage%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getMessage())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/Order.java index 2d31b42f0ce..8a1030199e0 100644 --- a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/Order.java @@ -335,32 +335,32 @@ public class Order { // add `id` to the URL query string if (getId() != null) { - joiner.add(String.format("%sid%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getId()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sid%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getId())))); } // add `petId` to the URL query string if (getPetId() != null) { - joiner.add(String.format("%spetId%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getPetId()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%spetId%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getPetId())))); } // add `quantity` to the URL query string if (getQuantity() != null) { - joiner.add(String.format("%squantity%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getQuantity()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%squantity%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getQuantity())))); } // add `shipDate` to the URL query string if (getShipDate() != null) { - joiner.add(String.format("%sshipDate%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getShipDate()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sshipDate%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getShipDate())))); } // add `status` to the URL query string if (getStatus() != null) { - joiner.add(String.format("%sstatus%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getStatus()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sstatus%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getStatus())))); } // add `complete` to the URL query string if (getComplete() != null) { - joiner.add(String.format("%scomplete%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getComplete()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%scomplete%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getComplete())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/Pet.java index 19be9d6817b..ae008998f73 100644 --- a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/Pet.java @@ -356,7 +356,7 @@ public class Pet { // add `id` to the URL query string if (getId() != null) { - joiner.add(String.format("%sid%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getId()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sid%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getId())))); } // add `category` to the URL query string @@ -366,7 +366,7 @@ public class Pet { // add `name` to the URL query string if (getName() != null) { - joiner.add(String.format("%sname%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sname%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getName())))); } // add `photoUrls` to the URL query string @@ -374,7 +374,7 @@ public class Pet { for (int i = 0; i < getPhotoUrls().size(); i++) { joiner.add(String.format("%sphotoUrls%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(ApiClient.valueToString(getPhotoUrls().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(ApiClient.valueToString(getPhotoUrls().get(i))))); } } @@ -390,7 +390,7 @@ public class Pet { // add `status` to the URL query string if (getStatus() != null) { - joiner.add(String.format("%sstatus%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getStatus()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sstatus%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getStatus())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/Tag.java index 5dafa8f47ae..7066e646333 100644 --- a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/Tag.java +++ b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/Tag.java @@ -173,12 +173,12 @@ public class Tag { // add `id` to the URL query string if (getId() != null) { - joiner.add(String.format("%sid%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getId()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sid%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getId())))); } // add `name` to the URL query string if (getName() != null) { - joiner.add(String.format("%sname%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sname%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getName())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/User.java index c3c9c96288c..ab92937955f 100644 --- a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/User.java +++ b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/User.java @@ -359,42 +359,42 @@ public class User { // add `id` to the URL query string if (getId() != null) { - joiner.add(String.format("%sid%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getId()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sid%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getId())))); } // add `username` to the URL query string if (getUsername() != null) { - joiner.add(String.format("%susername%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getUsername()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%susername%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getUsername())))); } // add `firstName` to the URL query string if (getFirstName() != null) { - joiner.add(String.format("%sfirstName%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getFirstName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sfirstName%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getFirstName())))); } // add `lastName` to the URL query string if (getLastName() != null) { - joiner.add(String.format("%slastName%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getLastName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%slastName%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getLastName())))); } // add `email` to the URL query string if (getEmail() != null) { - joiner.add(String.format("%semail%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getEmail()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%semail%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getEmail())))); } // add `password` to the URL query string if (getPassword() != null) { - joiner.add(String.format("%spassword%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getPassword()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%spassword%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getPassword())))); } // add `phone` to the URL query string if (getPhone() != null) { - joiner.add(String.format("%sphone%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getPhone()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sphone%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getPhone())))); } // add `userStatus` to the URL query string if (getUserStatus() != null) { - joiner.add(String.format("%suserStatus%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getUserStatus()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%suserStatus%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getUserStatus())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/Configuration.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/Configuration.java index 5e90f7ca1d5..8001c410264 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/Configuration.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/Configuration.java @@ -17,7 +17,7 @@ package org.openapitools.client; public class Configuration { public static final String VERSION = "1.0.0"; - private static ApiClient defaultApiClient = new ApiClient(); + private static volatile ApiClient defaultApiClient = new ApiClient(); /** * Get the default API client, which would be used when creating API diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/AnotherFakeApi.java index 318fce752f1..a992b771bab 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/AnotherFakeApi.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/AnotherFakeApi.java @@ -15,6 +15,7 @@ package org.openapitools.client.api; import org.openapitools.client.ApiClient; import org.openapitools.client.ApiException; import org.openapitools.client.ApiResponse; +import org.openapitools.client.Configuration; import org.openapitools.client.Pair; import org.openapitools.client.model.Client; @@ -55,7 +56,7 @@ public class AnotherFakeApi { private final Consumer> memberVarAsyncResponseInterceptor; public AnotherFakeApi() { - this(new ApiClient()); + this(Configuration.getDefaultApiClient()); } public AnotherFakeApi(ApiClient apiClient) { diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/DefaultApi.java index e11f3afd1f2..99ae51e475c 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/DefaultApi.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/DefaultApi.java @@ -15,6 +15,7 @@ package org.openapitools.client.api; import org.openapitools.client.ApiClient; import org.openapitools.client.ApiException; import org.openapitools.client.ApiResponse; +import org.openapitools.client.Configuration; import org.openapitools.client.Pair; import org.openapitools.client.model.FooGetDefaultResponse; @@ -55,7 +56,7 @@ public class DefaultApi { private final Consumer> memberVarAsyncResponseInterceptor; public DefaultApi() { - this(new ApiClient()); + this(Configuration.getDefaultApiClient()); } public DefaultApi(ApiClient apiClient) { diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java index 309d0d9e1a9..4eb97918508 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java @@ -15,6 +15,7 @@ package org.openapitools.client.api; import org.openapitools.client.ApiClient; import org.openapitools.client.ApiException; import org.openapitools.client.ApiResponse; +import org.openapitools.client.Configuration; import org.openapitools.client.Pair; import java.math.BigDecimal; @@ -72,7 +73,7 @@ public class FakeApi { private final Consumer> memberVarAsyncResponseInterceptor; public FakeApi() { - this(new ApiClient()); + this(Configuration.getDefaultApiClient()); } public FakeApi(ApiClient apiClient) { diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java index 97e8c92561f..6bc07b65ed7 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java @@ -15,6 +15,7 @@ package org.openapitools.client.api; import org.openapitools.client.ApiClient; import org.openapitools.client.ApiException; import org.openapitools.client.ApiResponse; +import org.openapitools.client.Configuration; import org.openapitools.client.Pair; import org.openapitools.client.model.Client; @@ -61,7 +62,7 @@ public class FakeClassnameTags123Api { private final Consumer> memberVarAsyncResponseInterceptor; public FakeClassnameTags123Api() { - this(new ApiClient()); + this(Configuration.getDefaultApiClient()); } public FakeClassnameTags123Api(ApiClient apiClient) { diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java index 3c15f31511c..5169d20a634 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java @@ -15,6 +15,7 @@ package org.openapitools.client.api; import org.openapitools.client.ApiClient; import org.openapitools.client.ApiException; import org.openapitools.client.ApiResponse; +import org.openapitools.client.Configuration; import org.openapitools.client.Pair; import java.io.File; @@ -63,7 +64,7 @@ public class PetApi { private final Consumer> memberVarAsyncResponseInterceptor; public PetApi() { - this(new ApiClient()); + this(Configuration.getDefaultApiClient()); } public PetApi(ApiClient apiClient) { diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/StoreApi.java index 23674386343..c90693e9818 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/StoreApi.java @@ -15,6 +15,7 @@ package org.openapitools.client.api; import org.openapitools.client.ApiClient; import org.openapitools.client.ApiException; import org.openapitools.client.ApiResponse; +import org.openapitools.client.Configuration; import org.openapitools.client.Pair; import org.openapitools.client.model.Order; @@ -61,7 +62,7 @@ public class StoreApi { private final Consumer> memberVarAsyncResponseInterceptor; public StoreApi() { - this(new ApiClient()); + this(Configuration.getDefaultApiClient()); } public StoreApi(ApiClient apiClient) { diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/UserApi.java index a26c78d5a44..5e02e08493e 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/UserApi.java @@ -15,6 +15,7 @@ package org.openapitools.client.api; import org.openapitools.client.ApiClient; import org.openapitools.client.ApiException; import org.openapitools.client.ApiResponse; +import org.openapitools.client.Configuration; import org.openapitools.client.Pair; import java.time.OffsetDateTime; @@ -62,7 +63,7 @@ public class UserApi { private final Consumer> memberVarAsyncResponseInterceptor; public UserApi() { - this(new ApiClient()); + this(Configuration.getDefaultApiClient()); } public UserApi(ApiClient apiClient) { diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index d9c3683b0d7..2d7a4589189 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -406,7 +406,7 @@ public class AdditionalPropertiesClass { for (String _key : getMapProperty().keySet()) { joiner.add(String.format("%smap_property%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix), - getMapProperty().get(_key), URLEncoder.encode(ApiClient.valueToString(getMapProperty().get(_key)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + getMapProperty().get(_key), ApiClient.urlEncode(ApiClient.valueToString(getMapProperty().get(_key))))); } } @@ -415,23 +415,23 @@ public class AdditionalPropertiesClass { for (String _key : getMapOfMapProperty().keySet()) { joiner.add(String.format("%smap_of_map_property%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix), - getMapOfMapProperty().get(_key), URLEncoder.encode(ApiClient.valueToString(getMapOfMapProperty().get(_key)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + getMapOfMapProperty().get(_key), ApiClient.urlEncode(ApiClient.valueToString(getMapOfMapProperty().get(_key))))); } } // add `anytype_1` to the URL query string if (getAnytype1() != null) { - joiner.add(String.format("%sanytype_1%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getAnytype1()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sanytype_1%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAnytype1())))); } // add `map_with_undeclared_properties_anytype_1` to the URL query string if (getMapWithUndeclaredPropertiesAnytype1() != null) { - joiner.add(String.format("%smap_with_undeclared_properties_anytype_1%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getMapWithUndeclaredPropertiesAnytype1()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%smap_with_undeclared_properties_anytype_1%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getMapWithUndeclaredPropertiesAnytype1())))); } // add `map_with_undeclared_properties_anytype_2` to the URL query string if (getMapWithUndeclaredPropertiesAnytype2() != null) { - joiner.add(String.format("%smap_with_undeclared_properties_anytype_2%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getMapWithUndeclaredPropertiesAnytype2()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%smap_with_undeclared_properties_anytype_2%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getMapWithUndeclaredPropertiesAnytype2())))); } // add `map_with_undeclared_properties_anytype_3` to the URL query string @@ -439,13 +439,13 @@ public class AdditionalPropertiesClass { for (String _key : getMapWithUndeclaredPropertiesAnytype3().keySet()) { joiner.add(String.format("%smap_with_undeclared_properties_anytype_3%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix), - getMapWithUndeclaredPropertiesAnytype3().get(_key), URLEncoder.encode(ApiClient.valueToString(getMapWithUndeclaredPropertiesAnytype3().get(_key)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + getMapWithUndeclaredPropertiesAnytype3().get(_key), ApiClient.urlEncode(ApiClient.valueToString(getMapWithUndeclaredPropertiesAnytype3().get(_key))))); } } // add `empty_map` to the URL query string if (getEmptyMap() != null) { - joiner.add(String.format("%sempty_map%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getEmptyMap()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sempty_map%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getEmptyMap())))); } // add `map_with_undeclared_properties_string` to the URL query string @@ -453,7 +453,7 @@ public class AdditionalPropertiesClass { for (String _key : getMapWithUndeclaredPropertiesString().keySet()) { joiner.add(String.format("%smap_with_undeclared_properties_string%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix), - getMapWithUndeclaredPropertiesString().get(_key), URLEncoder.encode(ApiClient.valueToString(getMapWithUndeclaredPropertiesString().get(_key)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + getMapWithUndeclaredPropertiesString().get(_key), ApiClient.urlEncode(ApiClient.valueToString(getMapWithUndeclaredPropertiesString().get(_key))))); } } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Animal.java index 969cb1eae6f..4b8e4537d38 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Animal.java @@ -181,12 +181,12 @@ public class Animal { // add `className` to the URL query string if (getClassName() != null) { - joiner.add(String.format("%sclassName%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getClassName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sclassName%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getClassName())))); } // add `color` to the URL query string if (getColor() != null) { - joiner.add(String.format("%scolor%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getColor()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%scolor%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getColor())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Apple.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Apple.java index aa9b358e483..bb28e46c122 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Apple.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Apple.java @@ -167,12 +167,12 @@ public class Apple { // add `cultivar` to the URL query string if (getCultivar() != null) { - joiner.add(String.format("%scultivar%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getCultivar()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%scultivar%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getCultivar())))); } // add `origin` to the URL query string if (getOrigin() != null) { - joiner.add(String.format("%sorigin%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getOrigin()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sorigin%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getOrigin())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AppleReq.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AppleReq.java index d1be47a034e..a20bb3575bb 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AppleReq.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AppleReq.java @@ -167,12 +167,12 @@ public class AppleReq { // add `cultivar` to the URL query string if (getCultivar() != null) { - joiner.add(String.format("%scultivar%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getCultivar()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%scultivar%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getCultivar())))); } // add `mealy` to the URL query string if (getMealy() != null) { - joiner.add(String.format("%smealy%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getMealy()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%smealy%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getMealy())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index d0e37a77fa5..ab0f384fb9b 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -152,7 +152,7 @@ public class ArrayOfArrayOfNumberOnly { if (getArrayArrayNumber().get(i) != null) { joiner.add(String.format("%sArrayArrayNumber%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(ApiClient.valueToString(getArrayArrayNumber().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(ApiClient.valueToString(getArrayArrayNumber().get(i))))); } } } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 94d46dd6d55..90fb815cab0 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -152,7 +152,7 @@ public class ArrayOfNumberOnly { if (getArrayNumber().get(i) != null) { joiner.add(String.format("%sArrayNumber%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(ApiClient.valueToString(getArrayNumber().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(ApiClient.valueToString(getArrayNumber().get(i))))); } } } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayTest.java index f4bd406ba58..dec8bf7b539 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -227,7 +227,7 @@ public class ArrayTest { for (int i = 0; i < getArrayOfString().size(); i++) { joiner.add(String.format("%sarray_of_string%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(ApiClient.valueToString(getArrayOfString().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(ApiClient.valueToString(getArrayOfString().get(i))))); } } @@ -236,7 +236,7 @@ public class ArrayTest { for (int i = 0; i < getArrayArrayOfInteger().size(); i++) { joiner.add(String.format("%sarray_array_of_integer%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(ApiClient.valueToString(getArrayArrayOfInteger().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(ApiClient.valueToString(getArrayArrayOfInteger().get(i))))); } } @@ -246,7 +246,7 @@ public class ArrayTest { if (getArrayArrayOfModel().get(i) != null) { joiner.add(String.format("%sarray_array_of_model%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(ApiClient.valueToString(getArrayArrayOfModel().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(ApiClient.valueToString(getArrayArrayOfModel().get(i))))); } } } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Banana.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Banana.java index 8f904398ebe..a200e961ff3 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Banana.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Banana.java @@ -138,7 +138,7 @@ public class Banana { // add `lengthCm` to the URL query string if (getLengthCm() != null) { - joiner.add(String.format("%slengthCm%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getLengthCm()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%slengthCm%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getLengthCm())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/BananaReq.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/BananaReq.java index 931948bc6ec..b4a67ad8762 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/BananaReq.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/BananaReq.java @@ -168,12 +168,12 @@ public class BananaReq { // add `lengthCm` to the URL query string if (getLengthCm() != null) { - joiner.add(String.format("%slengthCm%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getLengthCm()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%slengthCm%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getLengthCm())))); } // add `sweet` to the URL query string if (getSweet() != null) { - joiner.add(String.format("%ssweet%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getSweet()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%ssweet%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getSweet())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/BasquePig.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/BasquePig.java index b774e22a56c..ff45f2cf45b 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/BasquePig.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/BasquePig.java @@ -137,7 +137,7 @@ public class BasquePig { // add `className` to the URL query string if (getClassName() != null) { - joiner.add(String.format("%sclassName%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getClassName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sclassName%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getClassName())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Capitalization.java index 1429a98d255..cee009cb513 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Capitalization.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Capitalization.java @@ -287,32 +287,32 @@ public class Capitalization { // add `smallCamel` to the URL query string if (getSmallCamel() != null) { - joiner.add(String.format("%ssmallCamel%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getSmallCamel()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%ssmallCamel%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getSmallCamel())))); } // add `CapitalCamel` to the URL query string if (getCapitalCamel() != null) { - joiner.add(String.format("%sCapitalCamel%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getCapitalCamel()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sCapitalCamel%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getCapitalCamel())))); } // add `small_Snake` to the URL query string if (getSmallSnake() != null) { - joiner.add(String.format("%ssmall_Snake%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getSmallSnake()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%ssmall_Snake%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getSmallSnake())))); } // add `Capital_Snake` to the URL query string if (getCapitalSnake() != null) { - joiner.add(String.format("%sCapital_Snake%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getCapitalSnake()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sCapital_Snake%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getCapitalSnake())))); } // add `SCA_ETH_Flow_Points` to the URL query string if (getScAETHFlowPoints() != null) { - joiner.add(String.format("%sSCA_ETH_Flow_Points%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getScAETHFlowPoints()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sSCA_ETH_Flow_Points%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getScAETHFlowPoints())))); } // add `ATT_NAME` to the URL query string if (getATTNAME() != null) { - joiner.add(String.format("%sATT_NAME%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getATTNAME()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sATT_NAME%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getATTNAME())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Cat.java index 45e45a59a69..e2b6dcb411f 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Cat.java @@ -162,17 +162,17 @@ public class Cat extends Animal { // add `className` to the URL query string if (getClassName() != null) { - joiner.add(String.format("%sclassName%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getClassName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sclassName%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getClassName())))); } // add `color` to the URL query string if (getColor() != null) { - joiner.add(String.format("%scolor%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getColor()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%scolor%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getColor())))); } // add `declawed` to the URL query string if (getDeclawed() != null) { - joiner.add(String.format("%sdeclawed%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getDeclawed()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sdeclawed%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getDeclawed())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Category.java index 5cf2a1b46c8..13ab8913ea6 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Category.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Category.java @@ -167,12 +167,12 @@ public class Category { // add `id` to the URL query string if (getId() != null) { - joiner.add(String.format("%sid%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getId()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sid%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getId())))); } // add `name` to the URL query string if (getName() != null) { - joiner.add(String.format("%sname%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sname%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getName())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ChildCat.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ChildCat.java index 67ca7016c95..ac8a4e53b32 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ChildCat.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ChildCat.java @@ -193,12 +193,12 @@ public class ChildCat extends ParentPet { // add `pet_type` to the URL query string if (getPetType() != null) { - joiner.add(String.format("%spet_type%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getPetType()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%spet_type%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getPetType())))); } // add `name` to the URL query string if (getName() != null) { - joiner.add(String.format("%sname%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sname%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getName())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ClassModel.java index c49e1b7994f..a309d575a29 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ClassModel.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ClassModel.java @@ -137,7 +137,7 @@ public class ClassModel { // add `_class` to the URL query string if (getPropertyClass() != null) { - joiner.add(String.format("%s_class%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getPropertyClass()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%s_class%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getPropertyClass())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Client.java index 3f8a992e5f0..c6366f94bb0 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Client.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Client.java @@ -137,7 +137,7 @@ public class Client { // add `client` to the URL query string if (getClient() != null) { - joiner.add(String.format("%sclient%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getClient()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sclient%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getClient())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java index 49e8828fd83..003ab579508 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java @@ -167,12 +167,12 @@ public class ComplexQuadrilateral { // add `shapeType` to the URL query string if (getShapeType() != null) { - joiner.add(String.format("%sshapeType%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getShapeType()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sshapeType%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getShapeType())))); } // add `quadrilateralType` to the URL query string if (getQuadrilateralType() != null) { - joiner.add(String.format("%squadrilateralType%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getQuadrilateralType()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%squadrilateralType%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getQuadrilateralType())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/DanishPig.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/DanishPig.java index 69d296203fa..f9b03af63de 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/DanishPig.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/DanishPig.java @@ -137,7 +137,7 @@ public class DanishPig { // add `className` to the URL query string if (getClassName() != null) { - joiner.add(String.format("%sclassName%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getClassName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sclassName%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getClassName())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/DeprecatedObject.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/DeprecatedObject.java index e17aecac133..9e7d9945f20 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/DeprecatedObject.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/DeprecatedObject.java @@ -139,7 +139,7 @@ public class DeprecatedObject { // add `name` to the URL query string if (getName() != null) { - joiner.add(String.format("%sname%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sname%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getName())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Dog.java index 34010b9b568..9e3e0ac90b4 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Dog.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Dog.java @@ -161,17 +161,17 @@ public class Dog extends Animal { // add `className` to the URL query string if (getClassName() != null) { - joiner.add(String.format("%sclassName%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getClassName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sclassName%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getClassName())))); } // add `color` to the URL query string if (getColor() != null) { - joiner.add(String.format("%scolor%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getColor()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%scolor%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getColor())))); } // add `breed` to the URL query string if (getBreed() != null) { - joiner.add(String.format("%sbreed%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getBreed()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sbreed%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getBreed())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumArrays.java index 3f37849f76b..4c8cc4db998 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -247,7 +247,7 @@ public class EnumArrays { // add `just_symbol` to the URL query string if (getJustSymbol() != null) { - joiner.add(String.format("%sjust_symbol%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getJustSymbol()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sjust_symbol%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getJustSymbol())))); } // add `array_enum` to the URL query string @@ -255,7 +255,7 @@ public class EnumArrays { for (int i = 0; i < getArrayEnum().size(); i++) { joiner.add(String.format("%sarray_enum%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(ApiClient.valueToString(getArrayEnum().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(ApiClient.valueToString(getArrayEnum().get(i))))); } } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumTest.java index 37f7b51ca0d..1269519cabc 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumTest.java @@ -582,47 +582,47 @@ public class EnumTest { // add `enum_string` to the URL query string if (getEnumString() != null) { - joiner.add(String.format("%senum_string%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getEnumString()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%senum_string%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getEnumString())))); } // add `enum_string_required` to the URL query string if (getEnumStringRequired() != null) { - joiner.add(String.format("%senum_string_required%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getEnumStringRequired()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%senum_string_required%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getEnumStringRequired())))); } // add `enum_integer` to the URL query string if (getEnumInteger() != null) { - joiner.add(String.format("%senum_integer%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getEnumInteger()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%senum_integer%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getEnumInteger())))); } // add `enum_integer_only` to the URL query string if (getEnumIntegerOnly() != null) { - joiner.add(String.format("%senum_integer_only%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getEnumIntegerOnly()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%senum_integer_only%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getEnumIntegerOnly())))); } // add `enum_number` to the URL query string if (getEnumNumber() != null) { - joiner.add(String.format("%senum_number%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getEnumNumber()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%senum_number%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getEnumNumber())))); } // add `outerEnum` to the URL query string if (getOuterEnum() != null) { - joiner.add(String.format("%souterEnum%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getOuterEnum()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%souterEnum%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getOuterEnum())))); } // add `outerEnumInteger` to the URL query string if (getOuterEnumInteger() != null) { - joiner.add(String.format("%souterEnumInteger%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getOuterEnumInteger()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%souterEnumInteger%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getOuterEnumInteger())))); } // add `outerEnumDefaultValue` to the URL query string if (getOuterEnumDefaultValue() != null) { - joiner.add(String.format("%souterEnumDefaultValue%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getOuterEnumDefaultValue()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%souterEnumDefaultValue%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getOuterEnumDefaultValue())))); } // add `outerEnumIntegerDefaultValue` to the URL query string if (getOuterEnumIntegerDefaultValue() != null) { - joiner.add(String.format("%souterEnumIntegerDefaultValue%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getOuterEnumIntegerDefaultValue()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%souterEnumIntegerDefaultValue%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getOuterEnumIntegerDefaultValue())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EquilateralTriangle.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EquilateralTriangle.java index d9b02ee445f..0cdac510327 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EquilateralTriangle.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EquilateralTriangle.java @@ -167,12 +167,12 @@ public class EquilateralTriangle { // add `shapeType` to the URL query string if (getShapeType() != null) { - joiner.add(String.format("%sshapeType%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getShapeType()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sshapeType%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getShapeType())))); } // add `triangleType` to the URL query string if (getTriangleType() != null) { - joiner.add(String.format("%striangleType%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getTriangleType()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%striangleType%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getTriangleType())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java index 5535b13faef..e114aeee7ef 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java @@ -178,7 +178,7 @@ public class FakeBigDecimalMap200Response { // add `someId` to the URL query string if (getSomeId() != null) { - joiner.add(String.format("%ssomeId%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getSomeId()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%ssomeId%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getSomeId())))); } // add `someMap` to the URL query string @@ -186,7 +186,7 @@ public class FakeBigDecimalMap200Response { for (String _key : getSomeMap().keySet()) { joiner.add(String.format("%ssomeMap%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix), - getSomeMap().get(_key), URLEncoder.encode(ApiClient.valueToString(getSomeMap().get(_key)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + getSomeMap().get(_key), ApiClient.urlEncode(ApiClient.valueToString(getSomeMap().get(_key))))); } } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Foo.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Foo.java index 832c9b9ed86..bc0c2c27a84 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Foo.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Foo.java @@ -137,7 +137,7 @@ public class Foo { // add `bar` to the URL query string if (getBar() != null) { - joiner.add(String.format("%sbar%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getBar()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sbar%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getBar())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FormatTest.java index a6a3cdb6bb9..c41e55657c0 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FormatTest.java @@ -602,82 +602,82 @@ public class FormatTest { // add `integer` to the URL query string if (getInteger() != null) { - joiner.add(String.format("%sinteger%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getInteger()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sinteger%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getInteger())))); } // add `int32` to the URL query string if (getInt32() != null) { - joiner.add(String.format("%sint32%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getInt32()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sint32%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getInt32())))); } // add `int64` to the URL query string if (getInt64() != null) { - joiner.add(String.format("%sint64%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getInt64()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sint64%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getInt64())))); } // add `number` to the URL query string if (getNumber() != null) { - joiner.add(String.format("%snumber%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getNumber()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%snumber%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getNumber())))); } // add `float` to the URL query string if (getFloat() != null) { - joiner.add(String.format("%sfloat%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getFloat()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sfloat%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getFloat())))); } // add `double` to the URL query string if (getDouble() != null) { - joiner.add(String.format("%sdouble%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getDouble()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sdouble%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getDouble())))); } // add `decimal` to the URL query string if (getDecimal() != null) { - joiner.add(String.format("%sdecimal%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getDecimal()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sdecimal%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getDecimal())))); } // add `string` to the URL query string if (getString() != null) { - joiner.add(String.format("%sstring%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getString()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sstring%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getString())))); } // add `byte` to the URL query string if (getByte() != null) { - joiner.add(String.format("%sbyte%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getByte()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sbyte%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getByte())))); } // add `binary` to the URL query string if (getBinary() != null) { - joiner.add(String.format("%sbinary%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getBinary()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sbinary%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getBinary())))); } // add `date` to the URL query string if (getDate() != null) { - joiner.add(String.format("%sdate%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getDate()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sdate%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getDate())))); } // add `dateTime` to the URL query string if (getDateTime() != null) { - joiner.add(String.format("%sdateTime%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getDateTime()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sdateTime%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getDateTime())))); } // add `uuid` to the URL query string if (getUuid() != null) { - joiner.add(String.format("%suuid%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getUuid()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%suuid%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getUuid())))); } // add `password` to the URL query string if (getPassword() != null) { - joiner.add(String.format("%spassword%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getPassword()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%spassword%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getPassword())))); } // add `pattern_with_digits` to the URL query string if (getPatternWithDigits() != null) { - joiner.add(String.format("%spattern_with_digits%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getPatternWithDigits()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%spattern_with_digits%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getPatternWithDigits())))); } // add `pattern_with_digits_and_delimiter` to the URL query string if (getPatternWithDigitsAndDelimiter() != null) { - joiner.add(String.format("%spattern_with_digits_and_delimiter%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getPatternWithDigitsAndDelimiter()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%spattern_with_digits_and_delimiter%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getPatternWithDigitsAndDelimiter())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Fruit.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Fruit.java index f4fe41bb7a3..ddcf228ce38 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Fruit.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Fruit.java @@ -54,6 +54,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import com.fasterxml.jackson.databind.ser.std.StdSerializer; +import org.openapitools.client.ApiClient; import org.openapitools.client.JSON; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.12.0-SNAPSHOT") diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FruitReq.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FruitReq.java index 24bea076088..375125a0f23 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FruitReq.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FruitReq.java @@ -54,6 +54,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import com.fasterxml.jackson.databind.ser.std.StdSerializer; +import org.openapitools.client.ApiClient; import org.openapitools.client.JSON; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.12.0-SNAPSHOT") diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/GmFruit.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/GmFruit.java index fa84784ce87..e03fbcaee81 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/GmFruit.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/GmFruit.java @@ -51,6 +51,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import com.fasterxml.jackson.databind.ser.std.StdSerializer; +import org.openapitools.client.ApiClient; import org.openapitools.client.JSON; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.12.0-SNAPSHOT") diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/GrandparentAnimal.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/GrandparentAnimal.java index 6d30a2257d4..c52e779e406 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/GrandparentAnimal.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/GrandparentAnimal.java @@ -151,7 +151,7 @@ public class GrandparentAnimal { // add `pet_type` to the URL query string if (getPetType() != null) { - joiner.add(String.format("%spet_type%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getPetType()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%spet_type%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getPetType())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java index 7dec1cc0362..017063daee7 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java @@ -157,12 +157,12 @@ public class HasOnlyReadOnly { // add `bar` to the URL query string if (getBar() != null) { - joiner.add(String.format("%sbar%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getBar()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sbar%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getBar())))); } // add `foo` to the URL query string if (getFoo() != null) { - joiner.add(String.format("%sfoo%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getFoo()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sfoo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getFoo())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/HealthCheckResult.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/HealthCheckResult.java index 4975564671b..68a1932a5ec 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/HealthCheckResult.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/HealthCheckResult.java @@ -159,7 +159,7 @@ public class HealthCheckResult { // add `NullableMessage` to the URL query string if (getNullableMessage() != null) { - joiner.add(String.format("%sNullableMessage%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getNullableMessage()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sNullableMessage%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getNullableMessage())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/IsoscelesTriangle.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/IsoscelesTriangle.java index d2823e3e9ff..adf1eacf934 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/IsoscelesTriangle.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/IsoscelesTriangle.java @@ -167,12 +167,12 @@ public class IsoscelesTriangle { // add `shapeType` to the URL query string if (getShapeType() != null) { - joiner.add(String.format("%sshapeType%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getShapeType()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sshapeType%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getShapeType())))); } // add `triangleType` to the URL query string if (getTriangleType() != null) { - joiner.add(String.format("%striangleType%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getTriangleType()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%striangleType%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getTriangleType())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Mammal.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Mammal.java index aecb752d25d..fe6cf386d7d 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Mammal.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Mammal.java @@ -57,6 +57,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import com.fasterxml.jackson.databind.ser.std.StdSerializer; +import org.openapitools.client.ApiClient; import org.openapitools.client.JSON; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.12.0-SNAPSHOT") @@ -346,7 +347,7 @@ public class Mammal extends AbstractOpenApiSchema { } if (getActualInstance() instanceof Zebra) { if (getActualInstance() != null) { - joiner.add(String.format("%sone_of_1%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getActualInstance()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sone_of_1%s=%s", prefix, suffix, ApiClient.urlEncode(String.valueOf(getActualInstance())))); } return joiner.toString(); } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MapTest.java index e8b5d861c6d..6d6c37dc7f3 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MapTest.java @@ -299,7 +299,7 @@ public class MapTest { for (String _key : getMapMapOfString().keySet()) { joiner.add(String.format("%smap_map_of_string%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix), - getMapMapOfString().get(_key), URLEncoder.encode(ApiClient.valueToString(getMapMapOfString().get(_key)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + getMapMapOfString().get(_key), ApiClient.urlEncode(ApiClient.valueToString(getMapMapOfString().get(_key))))); } } @@ -308,7 +308,7 @@ public class MapTest { for (String _key : getMapOfEnumString().keySet()) { joiner.add(String.format("%smap_of_enum_string%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix), - getMapOfEnumString().get(_key), URLEncoder.encode(ApiClient.valueToString(getMapOfEnumString().get(_key)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + getMapOfEnumString().get(_key), ApiClient.urlEncode(ApiClient.valueToString(getMapOfEnumString().get(_key))))); } } @@ -317,7 +317,7 @@ public class MapTest { for (String _key : getDirectMap().keySet()) { joiner.add(String.format("%sdirect_map%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix), - getDirectMap().get(_key), URLEncoder.encode(ApiClient.valueToString(getDirectMap().get(_key)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + getDirectMap().get(_key), ApiClient.urlEncode(ApiClient.valueToString(getDirectMap().get(_key))))); } } @@ -326,7 +326,7 @@ public class MapTest { for (String _key : getIndirectMap().keySet()) { joiner.add(String.format("%sindirect_map%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix), - getIndirectMap().get(_key), URLEncoder.encode(ApiClient.valueToString(getIndirectMap().get(_key)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + getIndirectMap().get(_key), ApiClient.urlEncode(ApiClient.valueToString(getIndirectMap().get(_key))))); } } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 9f201eaa5db..92c1a9bb2f5 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -210,12 +210,12 @@ public class MixedPropertiesAndAdditionalPropertiesClass { // add `uuid` to the URL query string if (getUuid() != null) { - joiner.add(String.format("%suuid%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getUuid()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%suuid%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getUuid())))); } // add `dateTime` to the URL query string if (getDateTime() != null) { - joiner.add(String.format("%sdateTime%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getDateTime()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sdateTime%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getDateTime())))); } // add `map` to the URL query string diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Model200Response.java index cc4d8e8cfb0..71c9cdf2d5a 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Model200Response.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Model200Response.java @@ -167,12 +167,12 @@ public class Model200Response { // add `name` to the URL query string if (getName() != null) { - joiner.add(String.format("%sname%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sname%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getName())))); } // add `class` to the URL query string if (getPropertyClass() != null) { - joiner.add(String.format("%sclass%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getPropertyClass()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sclass%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getPropertyClass())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelApiResponse.java index cab137bf20e..5d346603d4e 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelApiResponse.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelApiResponse.java @@ -197,17 +197,17 @@ public class ModelApiResponse { // add `code` to the URL query string if (getCode() != null) { - joiner.add(String.format("%scode%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getCode()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%scode%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getCode())))); } // add `type` to the URL query string if (getType() != null) { - joiner.add(String.format("%stype%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getType()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%stype%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getType())))); } // add `message` to the URL query string if (getMessage() != null) { - joiner.add(String.format("%smessage%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getMessage()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%smessage%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getMessage())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelFile.java index 007b7cc09dd..889b989527e 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelFile.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelFile.java @@ -137,7 +137,7 @@ public class ModelFile { // add `sourceURI` to the URL query string if (getSourceURI() != null) { - joiner.add(String.format("%ssourceURI%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getSourceURI()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%ssourceURI%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getSourceURI())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelList.java index f7900e68490..5db2d6c900d 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelList.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelList.java @@ -137,7 +137,7 @@ public class ModelList { // add `123-list` to the URL query string if (get123list() != null) { - joiner.add(String.format("%s123-list%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(get123list()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%s123-list%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(get123list())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelReturn.java index 3f776041791..05bd74babb8 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelReturn.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelReturn.java @@ -137,7 +137,7 @@ public class ModelReturn { // add `return` to the URL query string if (getReturn() != null) { - joiner.add(String.format("%sreturn%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getReturn()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sreturn%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getReturn())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Name.java index 58eed2cbf8a..7daf09b8676 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Name.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Name.java @@ -217,22 +217,22 @@ public class Name { // add `name` to the URL query string if (getName() != null) { - joiner.add(String.format("%sname%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sname%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getName())))); } // add `snake_case` to the URL query string if (getSnakeCase() != null) { - joiner.add(String.format("%ssnake_case%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getSnakeCase()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%ssnake_case%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getSnakeCase())))); } // add `property` to the URL query string if (getProperty() != null) { - joiner.add(String.format("%sproperty%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getProperty()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sproperty%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getProperty())))); } // add `123Number` to the URL query string if (get123number() != null) { - joiner.add(String.format("%s123Number%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(get123number()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%s123Number%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(get123number())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NullableClass.java index a5468d0ad10..6259308b780 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NullableClass.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NullableClass.java @@ -672,32 +672,32 @@ public class NullableClass extends HashMap { // add `integer_prop` to the URL query string if (getIntegerProp() != null) { - joiner.add(String.format("%sinteger_prop%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getIntegerProp()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sinteger_prop%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getIntegerProp())))); } // add `number_prop` to the URL query string if (getNumberProp() != null) { - joiner.add(String.format("%snumber_prop%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getNumberProp()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%snumber_prop%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getNumberProp())))); } // add `boolean_prop` to the URL query string if (getBooleanProp() != null) { - joiner.add(String.format("%sboolean_prop%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getBooleanProp()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sboolean_prop%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getBooleanProp())))); } // add `string_prop` to the URL query string if (getStringProp() != null) { - joiner.add(String.format("%sstring_prop%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getStringProp()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sstring_prop%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getStringProp())))); } // add `date_prop` to the URL query string if (getDateProp() != null) { - joiner.add(String.format("%sdate_prop%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getDateProp()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sdate_prop%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getDateProp())))); } // add `datetime_prop` to the URL query string if (getDatetimeProp() != null) { - joiner.add(String.format("%sdatetime_prop%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getDatetimeProp()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sdatetime_prop%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getDatetimeProp())))); } // add `array_nullable_prop` to the URL query string @@ -705,7 +705,7 @@ public class NullableClass extends HashMap { for (int i = 0; i < getArrayNullableProp().size(); i++) { joiner.add(String.format("%sarray_nullable_prop%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(ApiClient.valueToString(getArrayNullableProp().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(ApiClient.valueToString(getArrayNullableProp().get(i))))); } } @@ -714,7 +714,7 @@ public class NullableClass extends HashMap { for (int i = 0; i < getArrayAndItemsNullableProp().size(); i++) { joiner.add(String.format("%sarray_and_items_nullable_prop%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(ApiClient.valueToString(getArrayAndItemsNullableProp().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(ApiClient.valueToString(getArrayAndItemsNullableProp().get(i))))); } } @@ -723,7 +723,7 @@ public class NullableClass extends HashMap { for (int i = 0; i < getArrayItemsNullable().size(); i++) { joiner.add(String.format("%sarray_items_nullable%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(ApiClient.valueToString(getArrayItemsNullable().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(ApiClient.valueToString(getArrayItemsNullable().get(i))))); } } @@ -732,7 +732,7 @@ public class NullableClass extends HashMap { for (String _key : getObjectNullableProp().keySet()) { joiner.add(String.format("%sobject_nullable_prop%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix), - getObjectNullableProp().get(_key), URLEncoder.encode(ApiClient.valueToString(getObjectNullableProp().get(_key)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + getObjectNullableProp().get(_key), ApiClient.urlEncode(ApiClient.valueToString(getObjectNullableProp().get(_key))))); } } @@ -741,7 +741,7 @@ public class NullableClass extends HashMap { for (String _key : getObjectAndItemsNullableProp().keySet()) { joiner.add(String.format("%sobject_and_items_nullable_prop%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix), - getObjectAndItemsNullableProp().get(_key), URLEncoder.encode(ApiClient.valueToString(getObjectAndItemsNullableProp().get(_key)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + getObjectAndItemsNullableProp().get(_key), ApiClient.urlEncode(ApiClient.valueToString(getObjectAndItemsNullableProp().get(_key))))); } } @@ -750,7 +750,7 @@ public class NullableClass extends HashMap { for (String _key : getObjectItemsNullable().keySet()) { joiner.add(String.format("%sobject_items_nullable%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix), - getObjectItemsNullable().get(_key), URLEncoder.encode(ApiClient.valueToString(getObjectItemsNullable().get(_key)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + getObjectItemsNullable().get(_key), ApiClient.urlEncode(ApiClient.valueToString(getObjectItemsNullable().get(_key))))); } } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NullableShape.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NullableShape.java index acc00ac285f..f6b80990e5e 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NullableShape.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NullableShape.java @@ -56,6 +56,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import com.fasterxml.jackson.databind.ser.std.StdSerializer; +import org.openapitools.client.ApiClient; import org.openapitools.client.JSON; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.12.0-SNAPSHOT") diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NumberOnly.java index fd52238b83c..8678bf26e0e 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NumberOnly.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NumberOnly.java @@ -138,7 +138,7 @@ public class NumberOnly { // add `JustNumber` to the URL query string if (getJustNumber() != null) { - joiner.add(String.format("%sJustNumber%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getJustNumber()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sJustNumber%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getJustNumber())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java index c7382ff77bd..f1bdc226340 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java @@ -245,12 +245,12 @@ public class ObjectWithDeprecatedFields { // add `uuid` to the URL query string if (getUuid() != null) { - joiner.add(String.format("%suuid%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getUuid()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%suuid%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getUuid())))); } // add `id` to the URL query string if (getId() != null) { - joiner.add(String.format("%sid%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getId()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sid%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getId())))); } // add `deprecatedRef` to the URL query string @@ -263,7 +263,7 @@ public class ObjectWithDeprecatedFields { for (int i = 0; i < getBars().size(); i++) { joiner.add(String.format("%sbars%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(ApiClient.valueToString(getBars().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(ApiClient.valueToString(getBars().get(i))))); } } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Order.java index 528019bc87c..3b91522ae54 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Order.java @@ -325,32 +325,32 @@ public class Order { // add `id` to the URL query string if (getId() != null) { - joiner.add(String.format("%sid%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getId()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sid%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getId())))); } // add `petId` to the URL query string if (getPetId() != null) { - joiner.add(String.format("%spetId%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getPetId()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%spetId%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getPetId())))); } // add `quantity` to the URL query string if (getQuantity() != null) { - joiner.add(String.format("%squantity%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getQuantity()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%squantity%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getQuantity())))); } // add `shipDate` to the URL query string if (getShipDate() != null) { - joiner.add(String.format("%sshipDate%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getShipDate()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sshipDate%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getShipDate())))); } // add `status` to the URL query string if (getStatus() != null) { - joiner.add(String.format("%sstatus%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getStatus()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sstatus%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getStatus())))); } // add `complete` to the URL query string if (getComplete() != null) { - joiner.add(String.format("%scomplete%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getComplete()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%scomplete%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getComplete())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/OuterComposite.java index e091be1ce53..45a4a57d789 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/OuterComposite.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/OuterComposite.java @@ -198,17 +198,17 @@ public class OuterComposite { // add `my_number` to the URL query string if (getMyNumber() != null) { - joiner.add(String.format("%smy_number%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getMyNumber()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%smy_number%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getMyNumber())))); } // add `my_string` to the URL query string if (getMyString() != null) { - joiner.add(String.format("%smy_string%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getMyString()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%smy_string%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getMyString())))); } // add `my_boolean` to the URL query string if (getMyBoolean() != null) { - joiner.add(String.format("%smy_boolean%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getMyBoolean()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%smy_boolean%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getMyBoolean())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ParentPet.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ParentPet.java index 00b13e4f586..ac37d6cd4eb 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ParentPet.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ParentPet.java @@ -128,7 +128,7 @@ public class ParentPet extends GrandparentAnimal { // add `pet_type` to the URL query string if (getPetType() != null) { - joiner.add(String.format("%spet_type%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getPetType()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%spet_type%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getPetType())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pet.java index 410c038d5ee..c772e07c07c 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pet.java @@ -344,7 +344,7 @@ public class Pet { // add `id` to the URL query string if (getId() != null) { - joiner.add(String.format("%sid%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getId()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sid%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getId())))); } // add `category` to the URL query string @@ -354,7 +354,7 @@ public class Pet { // add `name` to the URL query string if (getName() != null) { - joiner.add(String.format("%sname%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sname%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getName())))); } // add `photoUrls` to the URL query string @@ -362,7 +362,7 @@ public class Pet { for (int i = 0; i < getPhotoUrls().size(); i++) { joiner.add(String.format("%sphotoUrls%s%s=%s", prefix, suffix, "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), - URLEncoder.encode(ApiClient.valueToString(getPhotoUrls().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + ApiClient.urlEncode(ApiClient.valueToString(getPhotoUrls().get(i))))); } } @@ -378,7 +378,7 @@ public class Pet { // add `status` to the URL query string if (getStatus() != null) { - joiner.add(String.format("%sstatus%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getStatus()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sstatus%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getStatus())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pig.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pig.java index 8043c85e9fe..6cd533678f8 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pig.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pig.java @@ -56,6 +56,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import com.fasterxml.jackson.databind.ser.std.StdSerializer; +import org.openapitools.client.ApiClient; import org.openapitools.client.JSON; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.12.0-SNAPSHOT") diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Quadrilateral.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Quadrilateral.java index 038afe2e4f9..29b18de0fb1 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Quadrilateral.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Quadrilateral.java @@ -56,6 +56,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import com.fasterxml.jackson.databind.ser.std.StdSerializer; +import org.openapitools.client.ApiClient; import org.openapitools.client.JSON; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.12.0-SNAPSHOT") diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java index a30a8308c63..9ea15bfc67b 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java @@ -137,7 +137,7 @@ public class QuadrilateralInterface { // add `quadrilateralType` to the URL query string if (getQuadrilateralType() != null) { - joiner.add(String.format("%squadrilateralType%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getQuadrilateralType()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%squadrilateralType%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getQuadrilateralType())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java index 83323693f04..654764bb581 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java @@ -165,12 +165,12 @@ public class ReadOnlyFirst { // add `bar` to the URL query string if (getBar() != null) { - joiner.add(String.format("%sbar%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getBar()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sbar%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getBar())))); } // add `baz` to the URL query string if (getBaz() != null) { - joiner.add(String.format("%sbaz%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getBaz()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sbaz%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getBaz())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ScaleneTriangle.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ScaleneTriangle.java index 8f3e03def2a..09412778003 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ScaleneTriangle.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ScaleneTriangle.java @@ -167,12 +167,12 @@ public class ScaleneTriangle { // add `shapeType` to the URL query string if (getShapeType() != null) { - joiner.add(String.format("%sshapeType%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getShapeType()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sshapeType%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getShapeType())))); } // add `triangleType` to the URL query string if (getTriangleType() != null) { - joiner.add(String.format("%striangleType%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getTriangleType()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%striangleType%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getTriangleType())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Shape.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Shape.java index 8adb4ed877e..020c989ac03 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Shape.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Shape.java @@ -56,6 +56,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import com.fasterxml.jackson.databind.ser.std.StdSerializer; +import org.openapitools.client.ApiClient; import org.openapitools.client.JSON; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.12.0-SNAPSHOT") diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ShapeInterface.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ShapeInterface.java index ce0c2d1b610..c515443e969 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ShapeInterface.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ShapeInterface.java @@ -137,7 +137,7 @@ public class ShapeInterface { // add `shapeType` to the URL query string if (getShapeType() != null) { - joiner.add(String.format("%sshapeType%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getShapeType()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sshapeType%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getShapeType())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ShapeOrNull.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ShapeOrNull.java index 09ccf75afb5..037db0f9cd6 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ShapeOrNull.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ShapeOrNull.java @@ -56,6 +56,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import com.fasterxml.jackson.databind.ser.std.StdSerializer; +import org.openapitools.client.ApiClient; import org.openapitools.client.JSON; @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.12.0-SNAPSHOT") diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java index ac264e12f39..b695f499798 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java @@ -167,12 +167,12 @@ public class SimpleQuadrilateral { // add `shapeType` to the URL query string if (getShapeType() != null) { - joiner.add(String.format("%sshapeType%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getShapeType()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sshapeType%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getShapeType())))); } // add `quadrilateralType` to the URL query string if (getQuadrilateralType() != null) { - joiner.add(String.format("%squadrilateralType%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getQuadrilateralType()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%squadrilateralType%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getQuadrilateralType())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/SpecialModelName.java index fb50cc69f51..12cfb13c84e 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/SpecialModelName.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/SpecialModelName.java @@ -167,12 +167,12 @@ public class SpecialModelName { // add `$special[property.name]` to the URL query string if (get$SpecialPropertyName() != null) { - joiner.add(String.format("%s$special[property.name]%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(get$SpecialPropertyName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%s$special[property.name]%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(get$SpecialPropertyName())))); } // add `_special_model.name_` to the URL query string if (getSpecialModelName() != null) { - joiner.add(String.format("%s_special_model.name_%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getSpecialModelName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%s_special_model.name_%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getSpecialModelName())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Tag.java index 6838a771f0a..687d7f1e321 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Tag.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Tag.java @@ -167,12 +167,12 @@ public class Tag { // add `id` to the URL query string if (getId() != null) { - joiner.add(String.format("%sid%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getId()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sid%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getId())))); } // add `name` to the URL query string if (getName() != null) { - joiner.add(String.format("%sname%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sname%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getName())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java index f9ce918c827..1aad34dd026 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java @@ -188,7 +188,7 @@ public class TestInlineFreeformAdditionalPropertiesRequest extends HashMap { // add `type` to the URL query string if (getType() != null) { - joiner.add(String.format("%stype%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getType()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%stype%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getType())))); } // add `className` to the URL query string if (getClassName() != null) { - joiner.add(String.format("%sclassName%s=%s", prefix, suffix, URLEncoder.encode(ApiClient.valueToString(getClassName()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + joiner.add(String.format("%sclassName%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getClassName())))); } return joiner.toString(); diff --git a/samples/client/petstore/java/okhttp-gson-3.1-duplicated-operationid/src/main/java/org/openapitools/client/Configuration.java b/samples/client/petstore/java/okhttp-gson-3.1-duplicated-operationid/src/main/java/org/openapitools/client/Configuration.java index 5d904566a76..dc3549ea5a1 100644 --- a/samples/client/petstore/java/okhttp-gson-3.1-duplicated-operationid/src/main/java/org/openapitools/client/Configuration.java +++ b/samples/client/petstore/java/okhttp-gson-3.1-duplicated-operationid/src/main/java/org/openapitools/client/Configuration.java @@ -17,7 +17,7 @@ package org.openapitools.client; public class Configuration { public static final String VERSION = "1.0.0"; - private static ApiClient defaultApiClient = new ApiClient(); + private static volatile ApiClient defaultApiClient = new ApiClient(); /** * Get the default API client, which would be used when creating API diff --git a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/Configuration.java b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/Configuration.java index 5d904566a76..dc3549ea5a1 100644 --- a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/Configuration.java +++ b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/Configuration.java @@ -17,7 +17,7 @@ package org.openapitools.client; public class Configuration { public static final String VERSION = "1.0.0"; - private static ApiClient defaultApiClient = new ApiClient(); + private static volatile ApiClient defaultApiClient = new ApiClient(); /** * Get the default API client, which would be used when creating API diff --git a/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/Configuration.java b/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/Configuration.java index 5d904566a76..dc3549ea5a1 100644 --- a/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/Configuration.java +++ b/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/Configuration.java @@ -17,7 +17,7 @@ package org.openapitools.client; public class Configuration { public static final String VERSION = "1.0.0"; - private static ApiClient defaultApiClient = new ApiClient(); + private static volatile ApiClient defaultApiClient = new ApiClient(); /** * Get the default API client, which would be used when creating API diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/Configuration.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/Configuration.java index 5e90f7ca1d5..8001c410264 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/Configuration.java +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/Configuration.java @@ -17,7 +17,7 @@ package org.openapitools.client; public class Configuration { public static final String VERSION = "1.0.0"; - private static ApiClient defaultApiClient = new ApiClient(); + private static volatile ApiClient defaultApiClient = new ApiClient(); /** * Get the default API client, which would be used when creating API diff --git a/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/Configuration.java b/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/Configuration.java index 5d904566a76..dc3549ea5a1 100644 --- a/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/Configuration.java +++ b/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/Configuration.java @@ -17,7 +17,7 @@ package org.openapitools.client; public class Configuration { public static final String VERSION = "1.0.0"; - private static ApiClient defaultApiClient = new ApiClient(); + private static volatile ApiClient defaultApiClient = new ApiClient(); /** * Get the default API client, which would be used when creating API diff --git a/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/Configuration.java b/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/Configuration.java index 5d904566a76..dc3549ea5a1 100644 --- a/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/Configuration.java +++ b/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/Configuration.java @@ -17,7 +17,7 @@ package org.openapitools.client; public class Configuration { public static final String VERSION = "1.0.0"; - private static ApiClient defaultApiClient = new ApiClient(); + private static volatile ApiClient defaultApiClient = new ApiClient(); /** * Get the default API client, which would be used when creating API diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/Configuration.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/Configuration.java index 5e90f7ca1d5..8001c410264 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/Configuration.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/Configuration.java @@ -17,7 +17,7 @@ package org.openapitools.client; public class Configuration { public static final String VERSION = "1.0.0"; - private static ApiClient defaultApiClient = new ApiClient(); + private static volatile ApiClient defaultApiClient = new ApiClient(); /** * Get the default API client, which would be used when creating API diff --git a/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/Configuration.java b/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/Configuration.java index 5d904566a76..dc3549ea5a1 100644 --- a/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/Configuration.java +++ b/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/Configuration.java @@ -17,7 +17,7 @@ package org.openapitools.client; public class Configuration { public static final String VERSION = "1.0.0"; - private static ApiClient defaultApiClient = new ApiClient(); + private static volatile ApiClient defaultApiClient = new ApiClient(); /** * Get the default API client, which would be used when creating API diff --git a/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/Configuration.java b/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/Configuration.java index 5d904566a76..dc3549ea5a1 100644 --- a/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/Configuration.java +++ b/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/Configuration.java @@ -17,7 +17,7 @@ package org.openapitools.client; public class Configuration { public static final String VERSION = "1.0.0"; - private static ApiClient defaultApiClient = new ApiClient(); + private static volatile ApiClient defaultApiClient = new ApiClient(); /** * Get the default API client, which would be used when creating API diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/Configuration.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/Configuration.java index 5e90f7ca1d5..8001c410264 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/Configuration.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/Configuration.java @@ -17,7 +17,7 @@ package org.openapitools.client; public class Configuration { public static final String VERSION = "1.0.0"; - private static ApiClient defaultApiClient = new ApiClient(); + private static volatile ApiClient defaultApiClient = new ApiClient(); /** * Get the default API client, which would be used when creating API diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/Configuration.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/Configuration.java index 5e90f7ca1d5..8001c410264 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/Configuration.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/Configuration.java @@ -17,7 +17,7 @@ package org.openapitools.client; public class Configuration { public static final String VERSION = "1.0.0"; - private static ApiClient defaultApiClient = new ApiClient(); + private static volatile ApiClient defaultApiClient = new ApiClient(); /** * Get the default API client, which would be used when creating API diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/src/main/java/org/openapitools/client/Configuration.java b/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/src/main/java/org/openapitools/client/Configuration.java index df92662a01c..f8f974e48f3 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/src/main/java/org/openapitools/client/Configuration.java +++ b/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/src/main/java/org/openapitools/client/Configuration.java @@ -17,7 +17,7 @@ package org.openapitools.client; public class Configuration { public static final String VERSION = "1.0.0"; - private static ApiClient defaultApiClient = new ApiClient(); + private static volatile ApiClient defaultApiClient = new ApiClient(); /** * Get the default API client, which would be used when creating API diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/Configuration.java b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/Configuration.java index 99fb79f4bde..cb27cb40f02 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/Configuration.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/Configuration.java @@ -17,7 +17,7 @@ package org.openapitools.client; public class Configuration { public static final String VERSION = "1.0.0"; - private static ApiClient defaultApiClient = new ApiClient(); + private static volatile ApiClient defaultApiClient = new ApiClient(); /** * Get the default API client, which would be used when creating API diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/Configuration.java b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/Configuration.java index 5d904566a76..dc3549ea5a1 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/Configuration.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/Configuration.java @@ -17,7 +17,7 @@ package org.openapitools.client; public class Configuration { public static final String VERSION = "1.0.0"; - private static ApiClient defaultApiClient = new ApiClient(); + private static volatile ApiClient defaultApiClient = new ApiClient(); /** * Get the default API client, which would be used when creating API diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/Configuration.java b/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/Configuration.java index 5d904566a76..dc3549ea5a1 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/Configuration.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/Configuration.java @@ -17,7 +17,7 @@ package org.openapitools.client; public class Configuration { public static final String VERSION = "1.0.0"; - private static ApiClient defaultApiClient = new ApiClient(); + private static volatile ApiClient defaultApiClient = new ApiClient(); /** * Get the default API client, which would be used when creating API diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/Configuration.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/Configuration.java index 5e90f7ca1d5..8001c410264 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/Configuration.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/Configuration.java @@ -17,7 +17,7 @@ package org.openapitools.client; public class Configuration { public static final String VERSION = "1.0.0"; - private static ApiClient defaultApiClient = new ApiClient(); + private static volatile ApiClient defaultApiClient = new ApiClient(); /** * Get the default API client, which would be used when creating API