loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

reuse Configuration.defaultApiClientin no-arg Api ctors and make ref volatile (fixes issue #20633) (#20635)

Browse Source 
* made Configuration.defaultApiClient volatile so that if it's changed the new value is immediately visible to all other threads

* made no-arg api ctor use Configuration.getDefaultApiClient() instead of creating new ApiClient every time

* replaced all use of URLEncoder.encode with ApiClient.urlEncode; just code cleanup; no functional changes

* disabled AbstractJavaCodegenTest.testGeneratedExampleValues as it fails, possibly due to timezone (Locale.ROOT) of local system

* replaced thread-unsafe SimpleDateFormat with DateTimeFormatter and re-enabled unit-test

* removed unused import

* ran the generate-sample scripts and generated a HUGE number of changes!

* added missing import of Configuration to api.mustache (and, thus, all native samples)

* added missing import for ApiClient to anyof and oneof model mustaches
This commit is contained in:
Ron Reynolds 2025-02-18 22:47:55 -08:00 committed by GitHub
parent c349270c7a
commit eb668b6a76
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
215 changed files with 517 additions and 469 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
View File

@ -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 = "<default>";
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 {

2
modules/openapi-generator/src/main/resources/Java/Configuration.mustache vendored
View File

@ -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

15
modules/openapi-generator/src/main/resources/Java/libraries/native/anyof_model.mustache vendored
View File

@ -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}}

3
modules/openapi-generator/src/main/resources/Java/libraries/native/api.mustache vendored
View File

@ -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<HttpResponse<String>> memberVarAsyncResponseInterceptor;
public {{classname}}() {
this(new ApiClient());
this(Configuration.getDefaultApiClient());
}
public {{classname}}(ApiClient apiClient) {

15
modules/openapi-generator/src/main/resources/Java/libraries/native/oneof_model.mustache vendored
View File

@ -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}}

14
modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache vendored
View File

@ -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}}

2
modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java
View File

@ -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");
}
}

2
samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/Configuration.java
View File

@ -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

2
samples/client/echo_api/java/native/src/main/java/org/openapitools/client/Configuration.java
View File

@ -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

3
samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/AuthApi.java
View File

@ -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<HttpResponse<String>> memberVarAsyncResponseInterceptor;
public AuthApi() {
this(new ApiClient());
this(Configuration.getDefaultApiClient());
}
public AuthApi(ApiClient apiClient) {

3
samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/BodyApi.java
View File

@ -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<HttpResponse<String>> memberVarAsyncResponseInterceptor;
public BodyApi() {
this(new ApiClient());
this(Configuration.getDefaultApiClient());
}
public BodyApi(ApiClient apiClient) {

3
samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/FormApi.java
View File

@ -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<HttpResponse<String>> memberVarAsyncResponseInterceptor;
public FormApi() {
this(new ApiClient());
this(Configuration.getDefaultApiClient());
}
public FormApi(ApiClient apiClient) {

3
samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/HeaderApi.java
View File

@ -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<HttpResponse<String>> memberVarAsyncResponseInterceptor;
public HeaderApi() {
this(new ApiClient());
this(Configuration.getDefaultApiClient());
}
public HeaderApi(ApiClient apiClient) {

3
samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/PathApi.java
View File

@ -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<HttpResponse<String>> memberVarAsyncResponseInterceptor;
public PathApi() {
this(new ApiClient());
this(Configuration.getDefaultApiClient());
}
public PathApi(ApiClient apiClient) {

3
samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/QueryApi.java
View File

@ -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<HttpResponse<String>> memberVarAsyncResponseInterceptor;
public QueryApi() {
this(new ApiClient());
this(Configuration.getDefaultApiClient());
}
public QueryApi(ApiClient apiClient) {

4
samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Bird.java
View File

@ -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();

4
samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Category.java
View File

@ -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();

10
samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/DataQuery.java
View File

@ -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();

16
samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/DefaultValue.java
View File

@ -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();

6
samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java
View File

@ -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();

8
samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Pet.java
View File

@ -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();

4
samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Query.java
View File

@ -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)))));
}
}

4
samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Tag.java
View File

@ -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();

2
samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarker.java
View File

@ -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();

8
samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java
View File

@ -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();

2
samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java
View File

@ -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)))));
}
}

2
samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/Configuration.java
View File

@ -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

2
samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/Configuration.java
View File

@ -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

2
samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/Configuration.java
View File

@ -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

2
samples/client/others/java/jersey2-oneOf-Mixed/src/main/java/org/openapitools/client/Configuration.java
View File

@ -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

2
samples/client/others/java/jersey2-oneOf-duplicates/src/main/java/org/openapitools/client/Configuration.java
View File

@ -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

2
samples/client/others/java/okhttp-gson-oneOf-array/src/main/java/org/openapitools/client/Configuration.java
View File

@ -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

2
samples/client/others/java/okhttp-gson-oneOf/src/main/java/org/openapitools/client/Configuration.java
View File

@ -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

2
samples/client/others/java/okhttp-gson-streaming/src/main/java/org/openapitools/client/Configuration.java
View File

@ -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

2
samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/Configuration.java
View File

@ -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

2
samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/Configuration.java
View File

@ -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

2
samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/Configuration.java
View File

@ -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

2
samples/client/petstore/java/jersey3-oneOf/src/main/java/org/openapitools/client/Configuration.java
View File

@ -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

2
samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/Configuration.java
View File

@ -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

2
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/Configuration.java
View File

@ -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

3
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
View File

@ -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<HttpResponse<String>> memberVarAsyncResponseInterceptor;
public AnotherFakeApi() {
this(new ApiClient());
this(Configuration.getDefaultApiClient());
}
public AnotherFakeApi(ApiClient apiClient) {

3
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/DefaultApi.java
View File

@ -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<HttpResponse<String>> memberVarAsyncResponseInterceptor;
public DefaultApi() {
this(new ApiClient());
this(Configuration.getDefaultApiClient());
}
public DefaultApi(ApiClient apiClient) {

3
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java
View File

@ -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<HttpResponse<String>> memberVarAsyncResponseInterceptor;
public FakeApi() {
this(new ApiClient());
this(Configuration.getDefaultApiClient());
}
public FakeApi(ApiClient apiClient) {

3
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
View File

@ -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<HttpResponse<String>> memberVarAsyncResponseInterceptor;
public FakeClassnameTags123Api() {
this(new ApiClient());
this(Configuration.getDefaultApiClient());
}
public FakeClassnameTags123Api(ApiClient apiClient) {

3
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java
View File

@ -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<HttpResponse<String>> memberVarAsyncResponseInterceptor;
public PetApi() {
this(new ApiClient());
this(Configuration.getDefaultApiClient());
}
public PetApi(ApiClient apiClient) {

3
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/StoreApi.java
View File

@ -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<HttpResponse<String>> memberVarAsyncResponseInterceptor;
public StoreApi() {
this(new ApiClient());
this(Configuration.getDefaultApiClient());
}
public StoreApi(ApiClient apiClient) {

3
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/UserApi.java
View File

@ -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<HttpResponse<String>> memberVarAsyncResponseInterceptor;
public UserApi() {
this(new ApiClient());
this(Configuration.getDefaultApiClient());
}
public UserApi(ApiClient apiClient) {

16
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
View File

@ -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)))));
}
}

4
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Animal.java
View File

@ -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();

4
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Apple.java
View File

@ -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();

4
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AppleReq.java
View File

@ -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();

2
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
View File

@ -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)))));
}
}
}

2
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
View File

@ -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)))));
}
}
}

6
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayTest.java
View File

@ -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)))));
}
}
}

2
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Banana.java
View File

@ -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();

4
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/BananaReq.java
View File

@ -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();

2
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/BasquePig.java
View File

@ -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();

12
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Capitalization.java
View File

@ -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();

6
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Cat.java
View File

@ -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();

4
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Category.java
View File

@ -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();

4
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ChildCat.java
View File

@ -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();

2
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ClassModel.java
View File

@ -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();

2
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Client.java
View File

@ -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();

4
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java
View File

@ -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();

2
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/DanishPig.java
View File

@ -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();

2
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/DeprecatedObject.java
View File

@ -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();

6
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Dog.java
View File

@ -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();

4
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumArrays.java
View File

@ -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)))));
}
}

18
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumTest.java
View File

@ -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();

4
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EquilateralTriangle.java
View File

@ -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();

4
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
View File

@ -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)))));
}
}

2
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Foo.java
View File

@ -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();

32
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FormatTest.java
View File

@ -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();

1
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Fruit.java
View File

@ -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")

1
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FruitReq.java
View File

@ -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")

1
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/GmFruit.java
View File

@ -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")

2
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/GrandparentAnimal.java
View File

@ -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();

4
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
View File

@ -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();

2
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/HealthCheckResult.java
View File

@ -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();

4
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/IsoscelesTriangle.java
View File

@ -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();

3
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Mammal.java
View File

@ -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();
}

8
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/MapTest.java
View File

@ -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)))));
}
}

4
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
View File

@ -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

4
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Model200Response.java
View File

@ -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();

6
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelApiResponse.java
View File

@ -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();

2
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelFile.java
View File

@ -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();

2
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelList.java
View File

@ -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();

2
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelReturn.java
View File

@ -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();

8
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Name.java
View File

@ -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();

24
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NullableClass.java
View File

@ -690,32 +690,32 @@ public class NullableClass extends HashMap<String, Object> {
// 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<String, Object> {
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<String, Object> {
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<String, Object> {
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<String, Object> {
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<String, Object> {
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<String, Object> {
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)))));
}
}

1
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NullableShape.java
View File

@ -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")

2
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NumberOnly.java
View File

@ -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();

6
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
View File

@ -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)))));
}
}

12
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Order.java
View File

@ -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();

6
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/OuterComposite.java
View File

@ -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();

2
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ParentPet.java
View File

@ -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();

8
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Pet.java
View File

@ -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();

1
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Pig.java
View File

@ -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")

1
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Quadrilateral.java
View File

@ -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")

2
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java
View File

@ -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();

Some files were not shown because too many files have changed in this diff Show More