loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-10-14 08:23:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Java] Add missing Locale to String.format() invocations (#21871)

Browse Source 
* [Java] Add missing Locale to String.format() invocations

* chore: ./bin/generate-samples.sh ./bin/configs/*.yaml
This commit is contained in:
Jochen Schalanda 2025-09-03 08:52:49 +02:00 committed by GitHub
parent d1df75c61d
commit babb3e272b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2539 changed files with 5392 additions and 2392 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,6 +41,7 @@ import java.util.Arrays;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.TimeZone; import java.util.TimeZone;
import java.util.Locale;
import java.net.URLEncoder; import java.net.URLEncoder;
@ -694,6 +695,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
if (serverIndex != null) { if (serverIndex != null) {
if (serverIndex < 0 || serverIndex >= servers.size()) { if (serverIndex < 0 || serverIndex >= servers.size()) {
throw new ArrayIndexOutOfBoundsException(String.format( throw new ArrayIndexOutOfBoundsException(String.format(
Locale.ROOT,
"Invalid index %d when selecting the host settings. Must be less than %d", serverIndex, servers.size() "Invalid index %d when selecting the host settings. Must be less than %d", serverIndex, servers.size()
)); ));
} }

2
modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/ApiClient.mustache vendored
View File

@ -50,6 +50,7 @@ import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.function.Supplier; import java.util.function.Supplier;
import java.util.TimeZone; import java.util.TimeZone;
import java.util.Locale;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -929,6 +930,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
if (serverIndex != null) { if (serverIndex != null) {
if (serverIndex < 0 || serverIndex >= servers.size()) { if (serverIndex < 0 || serverIndex >= servers.size()) {
throw new ArrayIndexOutOfBoundsException(String.format( throw new ArrayIndexOutOfBoundsException(String.format(
Locale.ROOT,
"Invalid index %d when selecting the host settings. Must be less than %d", serverIndex, servers.size() "Invalid index %d when selecting the host settings. Must be less than %d", serverIndex, servers.size()
)); ));
} }

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

@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.StringJoiner; import java.util.StringJoiner;
@ -115,7 +116,7 @@ public class {{classname}} extends BaseApi {
localVarQueryParameterBaseName = "{{{baseName}}}"; localVarQueryParameterBaseName = "{{{baseName}}}";
{{#isArray}} {{#isArray}}
for (int i=0; i < {{paramName}}.size(); i++) { for (int i=0; i < {{paramName}}.size(); i++) {
localVarQueryStringJoiner.add({{paramName}}.get(i).toUrlQueryString(String.format("{{baseName}}[%d]", i))); localVarQueryStringJoiner.add({{paramName}}.get(i).toUrlQueryString(String.format(Locale.ROOT, "{{baseName}}[%d]", i)));
} }
{{/isArray}} {{/isArray}}
{{^isArray}} {{^isArray}}

3
modules/openapi-generator/src/main/resources/Java/libraries/feign/auth/ApiKeyAuth.mustache vendored
View File

@ -4,6 +4,7 @@ package {{invokerPackage}}.auth;
import feign.RequestInterceptor; import feign.RequestInterceptor;
import feign.RequestTemplate; import feign.RequestTemplate;
import java.util.Locale;
public class ApiKeyAuth implements RequestInterceptor { public class ApiKeyAuth implements RequestInterceptor {
private final String location; private final String location;
@ -39,7 +40,7 @@ public class ApiKeyAuth implements RequestInterceptor {
} else if ("header".equals(location)) { } else if ("header".equals(location)) {
template.header(paramName, apiKey); template.header(paramName, apiKey);
} else if ("cookie".equals(location)) { } else if ("cookie".equals(location)) {
template.header("Cookie", String.format("%s=%s", paramName, apiKey)); template.header("Cookie", String.format(Locale.ROOT, "%s=%s", paramName, apiKey));
} }
} }
} }

1
modules/openapi-generator/src/main/resources/Java/libraries/feign/model.mustache vendored
View File

@ -18,6 +18,7 @@ import com.fasterxml.jackson.annotation.JsonAnySetter;
{{/models}} {{/models}}
import java.util.Objects; import java.util.Objects;
import java.util.Arrays; import java.util.Arrays;
import java.util.Locale;
{{#imports}} {{#imports}}
import {{import}}; import {{import}};
{{/imports}} {{/imports}}

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

@ -366,8 +366,8 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
int i = 0; int i = 0;
for ({{items.dataType}} _item : {{getter}}()) { for ({{items.dataType}} _item : {{getter}}()) {
try { try {
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
URLEncoder.encode(String.valueOf(_item), "UTF-8").replaceAll("\\+", "%20"))); URLEncoder.encode(String.valueOf(_item), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
@ -381,8 +381,8 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
if ({{getter}}() != null) { if ({{getter}}() != null) {
for (int i = 0; i < {{getter}}().size(); i++) { for (int i = 0; i < {{getter}}().size(); i++) {
try { try {
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
URLEncoder.encode(String.valueOf({{getter}}().get(i)), "UTF-8").replaceAll("\\+", "%20"))); URLEncoder.encode(String.valueOf({{getter}}().get(i)), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
@ -399,8 +399,8 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
int i = 0; int i = 0;
for ({{items.dataType}} _item : {{getter}}()) { for ({{items.dataType}} _item : {{getter}}()) {
if (_item != null) { if (_item != null) {
joiner.add(_item.toUrlQueryString(String.format("%s{{baseName}}%s%s", prefix, suffix, joiner.add(_item.toUrlQueryString(String.format(Locale.ROOT, "%s{{baseName}}%s%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix)))); "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix))));
} }
} }
i++; i++;
@ -410,8 +410,8 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
if ({{getter}}() != null) { if ({{getter}}() != null) {
for (int i = 0; i < {{getter}}().size(); i++) { for (int i = 0; i < {{getter}}().size(); i++) {
if ({{getter}}().get(i) != null) { if ({{getter}}().get(i) != null) {
joiner.add({{getter}}().get(i).toUrlQueryString(String.format("%s{{baseName}}%s%s", prefix, suffix, joiner.add({{getter}}().get(i).toUrlQueryString(String.format(Locale.ROOT, "%s{{baseName}}%s%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix)))); "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix))));
} }
} }
} }
@ -424,8 +424,8 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
for ({{items.dataType}} _item : {{getter}}()) { for ({{items.dataType}} _item : {{getter}}()) {
if (_item != null) { if (_item != null) {
try { try {
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
URLEncoder.encode(String.valueOf(_item), "UTF-8").replaceAll("\\+", "%20"))); URLEncoder.encode(String.valueOf(_item), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
@ -441,8 +441,8 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
for (int i = 0; i < {{getter}}().size(); i++) { for (int i = 0; i < {{getter}}().size(); i++) {
if ({{getter}}().get(i) != null) { if ({{getter}}().get(i) != null) {
try { try {
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
URLEncoder.encode(String.valueOf({{getter}}().get(i)), "UTF-8").replaceAll("\\+", "%20"))); URLEncoder.encode(String.valueOf({{getter}}().get(i)), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
@ -461,8 +461,8 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
if ({{getter}}() != null) { if ({{getter}}() != null) {
for (String _key : {{getter}}().keySet()) { for (String _key : {{getter}}().keySet()) {
try { try {
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, _key, containerSuffix),
{{getter}}().get(_key), URLEncoder.encode(String.valueOf({{getter}}().get(_key)), "UTF-8").replaceAll("\\+", "%20"))); {{getter}}().get(_key), URLEncoder.encode(String.valueOf({{getter}}().get(_key)), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
@ -475,8 +475,8 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
if ({{getter}}() != null) { if ({{getter}}() != null) {
for (String _key : {{getter}}().keySet()) { for (String _key : {{getter}}().keySet()) {
if ({{getter}}().get(_key) != null) { if ({{getter}}().get(_key) != null) {
joiner.add({{getter}}().get(_key).toUrlQueryString(String.format("%s{{baseName}}%s%s", prefix, suffix, joiner.add({{getter}}().get(_key).toUrlQueryString(String.format(Locale.ROOT, "%s{{baseName}}%s%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix)))); "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, _key, containerSuffix))));
} }
} }
} }
@ -486,7 +486,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
{{#isPrimitiveType}} {{#isPrimitiveType}}
if ({{getter}}() != null) { if ({{getter}}() != null) {
try { try {
joiner.add(String.format("%s{{{baseName}}}%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf({{{getter}}}()), "UTF-8").replaceAll("\\+", "%20"))); joiner.add(String.format(Locale.ROOT, "%s{{{baseName}}}%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf({{{getter}}}()), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
throw new RuntimeException(e); throw new RuntimeException(e);
@ -502,7 +502,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
{{^isModel}} {{^isModel}}
if ({{getter}}() != null) { if ({{getter}}() != null) {
try { try {
joiner.add(String.format("%s{{{baseName}}}%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf({{{getter}}}()), "UTF-8").replaceAll("\\+", "%20"))); joiner.add(String.format(Locale.ROOT, "%s{{{baseName}}}%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf({{{getter}}}()), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
throw new RuntimeException(e); throw new RuntimeException(e);

2
modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache vendored
View File

@ -54,6 +54,7 @@ import java.util.List;
import java.util.Arrays; import java.util.Arrays;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.Locale;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
{{#jsr310}} {{#jsr310}}
@ -1223,6 +1224,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
if (index < 0 || index >= serverConfigurations.size()) { if (index < 0 || index >= serverConfigurations.size()) {
throw new ArrayIndexOutOfBoundsException( throw new ArrayIndexOutOfBoundsException(
String.format( String.format(
Locale.ROOT,
"Invalid index %d when selecting the host settings. Must be less than %d", "Invalid index %d when selecting the host settings. Must be less than %d",
index, serverConfigurations.size())); index, serverConfigurations.size()));
} }

1
modules/openapi-generator/src/main/resources/Java/libraries/jersey2/model.mustache vendored
View File

@ -19,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonAnySetter;
import java.util.Objects; import java.util.Objects;
import java.util.Map; import java.util.Map;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale;
{{#imports}} {{#imports}}
import {{import}}; import {{import}};
{{/imports}} {{/imports}}

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

@ -6,6 +6,7 @@ import java.util.logging.Logger;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import java.util.Locale;
import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonParser;
@ -70,7 +71,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
return new{{classname}}; return new{{classname}};
{{/mappedModels}} {{/mappedModels}}
default: default:
log.log(Level.WARNING, String.format("Failed to lookup discriminator value `%s` for {{classname}}. Possible values:{{#mappedModels}} {{{mappingName}}}{{/mappedModels}}", discriminatorValue)); log.log(Level.WARNING, String.format(Locale.ROOT, "Failed to lookup discriminator value `%s` for {{classname}}. Possible values:{{#mappedModels}} {{{mappingName}}}{{/mappedModels}}", discriminatorValue));
} }
{{/discriminator}} {{/discriminator}}
@ -157,7 +158,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
ret.setActualInstance(deserialized); ret.setActualInstance(deserialized);
return ret; return ret;
} }
throw new IOException(String.format("Failed deserialization for {{classname}}: %d classes match result, expected 1", match)); throw new IOException(String.format(Locale.ROOT, "Failed deserialization for {{classname}}: %d classes match result, expected 1", match));
} }
/** /**

2
modules/openapi-generator/src/main/resources/Java/libraries/jersey3/ApiClient.mustache vendored
View File

@ -54,6 +54,7 @@ import java.util.List;
import java.util.Arrays; import java.util.Arrays;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.Locale;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
{{#jsr310}} {{#jsr310}}
@ -1223,6 +1224,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
if (index < 0 || index >= serverConfigurations.size()) { if (index < 0 || index >= serverConfigurations.size()) {
throw new ArrayIndexOutOfBoundsException( throw new ArrayIndexOutOfBoundsException(
String.format( String.format(
Locale.ROOT,
"Invalid index %d when selecting the host settings. Must be less than %d", "Invalid index %d when selecting the host settings. Must be less than %d",
index, serverConfigurations.size())); index, serverConfigurations.size()));
} }

1
modules/openapi-generator/src/main/resources/Java/libraries/jersey3/model.mustache vendored
View File

@ -19,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonAnySetter;
import java.util.Objects; import java.util.Objects;
import java.util.Map; import java.util.Map;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale;
{{#imports}} {{#imports}}
import {{import}}; import {{import}};
{{/imports}} {{/imports}}

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

@ -6,6 +6,7 @@ import java.util.logging.Logger;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import java.util.Locale;
import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonParser;
@ -70,7 +71,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
return new{{classname}}; return new{{classname}};
{{/mappedModels}} {{/mappedModels}}
default: default:
log.log(Level.WARNING, String.format("Failed to lookup discriminator value `%s` for {{classname}}. Possible values:{{#mappedModels}} {{{mappingName}}}{{/mappedModels}}", discriminatorValue)); log.log(Level.WARNING, String.format(Locale.ROOT, "Failed to lookup discriminator value `%s` for {{classname}}. Possible values:{{#mappedModels}} {{{mappingName}}}{{/mappedModels}}", discriminatorValue));
} }
{{/discriminator}} {{/discriminator}}
@ -157,7 +158,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
ret.setActualInstance(deserialized); ret.setActualInstance(deserialized);
return ret; return ret;
} }
throw new IOException(String.format("Failed deserialization for {{classname}}: %d classes match result, expected 1", match)); throw new IOException(String.format(Locale.ROOT, "Failed deserialization for {{classname}}: %d classes match result, expected 1", match));
} }
/** /**

1
modules/openapi-generator/src/main/resources/Java/libraries/microprofile/model.mustache vendored
View File

@ -9,6 +9,7 @@ import java.util.Objects;
import java.util.Arrays; import java.util.Arrays;
import java.util.Map; import java.util.Map;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale;
{{#imports}}import {{import}}; {{#imports}}import {{import}};
{{/imports}} {{/imports}}
{{#serializableModel}} {{#serializableModel}}

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

@ -4,6 +4,7 @@ import java.util.logging.Logger;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import java.util.Locale;
import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonParser;
@ -241,8 +242,8 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
if (getActualInstance() != null) { if (getActualInstance() != null) {
int i = 0; int i = 0;
for ({{{items.dataType}}} _item : ({{{dataType}}})getActualInstance()) { for ({{{items.dataType}}} _item : ({{{dataType}}})getActualInstance()) {
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
ApiClient.urlEncode(String.valueOf(_item)))); ApiClient.urlEncode(String.valueOf(_item))));
} }
i++; i++;
@ -251,8 +252,8 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
{{^uniqueItems}} {{^uniqueItems}}
if (getActualInstance() != null) { if (getActualInstance() != null) {
for (int i = 0; i < (({{{dataType}}})getActualInstance()).size(); i++) { for (int i = 0; i < (({{{dataType}}})getActualInstance()).size(); i++) {
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
ApiClient.urlEncode(String.valueOf(getActualInstance().get(i))))); ApiClient.urlEncode(String.valueOf(getActualInstance().get(i)))));
} }
} }
@ -265,8 +266,8 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
int i = 0; int i = 0;
for ({{{items.dataType}}} _item : ({{{dataType}}})getActualInstance()) { for ({{{items.dataType}}} _item : ({{{dataType}}})getActualInstance()) {
if (_item != null) { if (_item != null) {
joiner.add(_item.toUrlQueryString(String.format("%s{{baseName}}%s%s", prefix, suffix, joiner.add(_item.toUrlQueryString(String.format(Locale.ROOT, "%s{{baseName}}%s%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix)))); "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix))));
} }
} }
i++; i++;
@ -276,8 +277,8 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
if (getActualInstance() != null) { if (getActualInstance() != null) {
for (int i = 0; i < (({{{dataType}}})getActualInstance()).size(); i++) { for (int i = 0; i < (({{{dataType}}})getActualInstance()).size(); i++) {
if ((({{{dataType}}})getActualInstance()).get(i) != null) { if ((({{{dataType}}})getActualInstance()).get(i) != null) {
joiner.add((({{{items.dataType}}})getActualInstance()).get(i).toUrlQueryString(String.format("%s{{baseName}}%s%s", prefix, suffix, joiner.add((({{{items.dataType}}})getActualInstance()).get(i).toUrlQueryString(String.format(Locale.ROOT, "%s{{baseName}}%s%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix)))); "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix))));
} }
} }
} }
@ -289,8 +290,8 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
int i = 0; int i = 0;
for ({{{items.dataType}}} _item : ({{{dataType}}})getActualInstance()) { for ({{{items.dataType}}} _item : ({{{dataType}}})getActualInstance()) {
if (_item != null) { if (_item != null) {
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
ApiClient.urlEncode(String.valueOf(_item)))); ApiClient.urlEncode(String.valueOf(_item))));
} }
i++; i++;
@ -301,8 +302,8 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
if (getActualInstance() != null) { if (getActualInstance() != null) {
for (int i = 0; i < (({{{dataType}}})getActualInstance()).size(); i++) { for (int i = 0; i < (({{{dataType}}})getActualInstance()).size(); i++) {
if (getActualInstance().get(i) != null) { if (getActualInstance().get(i) != null) {
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
ApiClient.urlEncode(String.valueOf((({{{dataType}}})getActualInstance()).get(i))))); ApiClient.urlEncode(String.valueOf((({{{dataType}}})getActualInstance()).get(i)))));
} }
} }
@ -316,8 +317,8 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
{{#items.isPrimitiveType}} {{#items.isPrimitiveType}}
if (getActualInstance() != null) { if (getActualInstance() != null) {
for (String _key : (({{{dataType}}})getActualInstance()).keySet()) { for (String _key : (({{{dataType}}})getActualInstance()).keySet()) {
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, _key, containerSuffix),
getActualInstance().get(_key), ApiClient.urlEncode(String.valueOf((({{{dataType}}})getActualInstance()).get(_key))))); getActualInstance().get(_key), ApiClient.urlEncode(String.valueOf((({{{dataType}}})getActualInstance()).get(_key)))));
} }
} }
@ -326,8 +327,8 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
if (getActualInstance() != null) { if (getActualInstance() != null) {
for (String _key : (({{{dataType}}})getActualInstance()).keySet()) { for (String _key : (({{{dataType}}})getActualInstance()).keySet()) {
if ((({{{dataType}}})getActualInstance()).get(_key) != null) { if ((({{{dataType}}})getActualInstance()).get(_key) != null) {
joiner.add((({{{items.dataType}}})getActualInstance()).get(_key).toUrlQueryString(String.format("%s{{baseName}}%s%s", prefix, suffix, joiner.add((({{{items.dataType}}})getActualInstance()).get(_key).toUrlQueryString(String.format(Locale.ROOT, "%s{{baseName}}%s%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix)))); "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, _key, containerSuffix))));
} }
} }
} }
@ -336,7 +337,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
{{^isMap}} {{^isMap}}
{{#isPrimitiveType}} {{#isPrimitiveType}}
if (getActualInstance() != null) { if (getActualInstance() != null) {
joiner.add(String.format("%s{{{baseName}}}%s=%s", prefix, suffix, ApiClient.urlEncode(String.valueOf(getActualInstance())))); joiner.add(String.format(Locale.ROOT, "%s{{{baseName}}}%s=%s", prefix, suffix, ApiClient.urlEncode(String.valueOf(getActualInstance()))));
} }
{{/isPrimitiveType}} {{/isPrimitiveType}}
{{^isPrimitiveType}} {{^isPrimitiveType}}
@ -347,7 +348,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
{{/isModel}} {{/isModel}}
{{^isModel}} {{^isModel}}
if (getActualInstance() != null) { if (getActualInstance() != null) {
joiner.add(String.format("%s{{{baseName}}}%s=%s", prefix, suffix, ApiClient.urlEncode(String.valueOf(getActualInstance())))); joiner.add(String.format(Locale.ROOT, "%s{{{baseName}}}%s=%s", prefix, suffix, ApiClient.urlEncode(String.valueOf(getActualInstance()))));
} }
{{/isModel}} {{/isModel}}
{{/isPrimitiveType}} {{/isPrimitiveType}}

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

@ -47,6 +47,7 @@ import java.util.StringJoiner;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.Locale;
import java.util.function.Consumer; import java.util.function.Consumer;
{{#asyncNative}} {{#asyncNative}}
@ -580,7 +581,7 @@ public class {{classname}} {
if ({{paramName}} != null) { if ({{paramName}} != null) {
{{#isArray}} {{#isArray}}
for (int i=0; i < {{paramName}}.size(); i++) { for (int i=0; i < {{paramName}}.size(); i++) {
localVarQueryStringJoiner.add({{paramName}}.get(i).toUrlQueryString(String.format("{{baseName}}[%d]", i))); localVarQueryStringJoiner.add({{paramName}}.get(i).toUrlQueryString(String.format(Locale.ROOT, "{{baseName}}[%d]", i)));
} }
{{/isArray}} {{/isArray}}
{{^isArray}} {{^isArray}}

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

@ -24,6 +24,7 @@ import java.util.StringJoiner;
import java.util.Objects; import java.util.Objects;
import java.util.Map; import java.util.Map;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale;
{{#imports}} {{#imports}}
import {{import}}; import {{import}};
{{/imports}} {{/imports}}

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

@ -12,6 +12,7 @@ import com.google.gson.stream.JsonWriter;
{{#isUri}} {{#isUri}}
import java.net.URI; import java.net.URI;
{{/isUri}} {{/isUri}}
import java.util.Locale;
/** /**
* {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}} * {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}}
@ -78,7 +79,7 @@ import java.net.URI;
prefix = ""; prefix = "";
} }
return String.format("%s=%s", prefix, this.toString()); return String.format(Locale.ROOT, "%s=%s", prefix, this.toString());
} }
{{/supportUrlQuery}} {{/supportUrlQuery}}

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

@ -4,6 +4,7 @@ import java.util.logging.Logger;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import java.util.Locale;
import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonParser;
@ -68,7 +69,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
return new{{classname}}; return new{{classname}};
{{/mappedModels}} {{/mappedModels}}
default: default:
log.log(Level.WARNING, String.format("Failed to lookup discriminator value `%s` for {{classname}}. Possible values:{{#mappedModels}} {{{mappingName}}}{{/mappedModels}}", discriminatorValue)); log.log(Level.WARNING, String.format(Locale.ROOT, "Failed to lookup discriminator value `%s` for {{classname}}. Possible values:{{#mappedModels}} {{{mappingName}}}{{/mappedModels}}", discriminatorValue));
} }
{{/discriminator}} {{/discriminator}}
@ -112,7 +113,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
ret.setActualInstance(deserialized); ret.setActualInstance(deserialized);
return ret; return ret;
} }
throw new IOException(String.format("Failed deserialization for {{classname}}: %d classes match result, expected 1", match)); throw new IOException(String.format(Locale.ROOT, "Failed deserialization for {{classname}}: %d classes match result, expected 1", match));
} }
/** /**
@ -274,8 +275,8 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
if (getActualInstance() != null) { if (getActualInstance() != null) {
int i = 0; int i = 0;
for ({{{items.dataType}}} _item : ({{{dataType}}})getActualInstance()) { for ({{{items.dataType}}} _item : ({{{dataType}}})getActualInstance()) {
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
ApiClient.urlEncode(String.valueOf(_item)))); ApiClient.urlEncode(String.valueOf(_item))));
} }
i++; i++;
@ -284,8 +285,8 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
{{^uniqueItems}} {{^uniqueItems}}
if (getActualInstance() != null) { if (getActualInstance() != null) {
for (int i = 0; i < (({{{dataType}}})getActualInstance()).size(); i++) { for (int i = 0; i < (({{{dataType}}})getActualInstance()).size(); i++) {
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
ApiClient.urlEncode(String.valueOf(getActualInstance().get(i))))); ApiClient.urlEncode(String.valueOf(getActualInstance().get(i)))));
} }
} }
@ -298,8 +299,8 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
int i = 0; int i = 0;
for ({{{items.dataType}}} _item : ({{{dataType}}})getActualInstance()) { for ({{{items.dataType}}} _item : ({{{dataType}}})getActualInstance()) {
if (_item != null) { if (_item != null) {
joiner.add(_item.toUrlQueryString(String.format("%s{{baseName}}%s%s", prefix, suffix, joiner.add(_item.toUrlQueryString(String.format(Locale.ROOT, "%s{{baseName}}%s%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix)))); "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix))));
} }
} }
i++; i++;
@ -309,8 +310,8 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
if (getActualInstance() != null) { if (getActualInstance() != null) {
for (int i = 0; i < (({{{dataType}}})getActualInstance()).size(); i++) { for (int i = 0; i < (({{{dataType}}})getActualInstance()).size(); i++) {
if ((({{{dataType}}})getActualInstance()).get(i) != null) { if ((({{{dataType}}})getActualInstance()).get(i) != null) {
joiner.add((({{{items.dataType}}})getActualInstance()).get(i).toUrlQueryString(String.format("%s{{baseName}}%s%s", prefix, suffix, joiner.add((({{{items.dataType}}})getActualInstance()).get(i).toUrlQueryString(String.format(Locale.ROOT, "%s{{baseName}}%s%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix)))); "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix))));
} }
} }
} }
@ -322,8 +323,8 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
int i = 0; int i = 0;
for ({{{items.dataType}}} _item : ({{{dataType}}})getActualInstance()) { for ({{{items.dataType}}} _item : ({{{dataType}}})getActualInstance()) {
if (_item != null) { if (_item != null) {
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
ApiClient.urlEncode(String.valueOf(_item)))); ApiClient.urlEncode(String.valueOf(_item))));
} }
i++; i++;
@ -334,8 +335,8 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
if (getActualInstance() != null) { if (getActualInstance() != null) {
for (int i = 0; i < (({{{dataType}}})getActualInstance()).size(); i++) { for (int i = 0; i < (({{{dataType}}})getActualInstance()).size(); i++) {
if (getActualInstance().get(i) != null) { if (getActualInstance().get(i) != null) {
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
ApiClient.urlEncode(String.valueOf((({{{dataType}}})getActualInstance()).get(i))))); ApiClient.urlEncode(String.valueOf((({{{dataType}}})getActualInstance()).get(i)))));
} }
} }
@ -349,8 +350,8 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
{{#items.isPrimitiveType}} {{#items.isPrimitiveType}}
if (getActualInstance() != null) { if (getActualInstance() != null) {
for (String _key : (({{{dataType}}})getActualInstance()).keySet()) { for (String _key : (({{{dataType}}})getActualInstance()).keySet()) {
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, _key, containerSuffix),
getActualInstance().get(_key), ApiClient.urlEncode(String.valueOf((({{{dataType}}})getActualInstance()).get(_key))))); getActualInstance().get(_key), ApiClient.urlEncode(String.valueOf((({{{dataType}}})getActualInstance()).get(_key)))));
} }
} }
@ -359,8 +360,8 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
if (getActualInstance() != null) { if (getActualInstance() != null) {
for (String _key : (({{{dataType}}})getActualInstance()).keySet()) { for (String _key : (({{{dataType}}})getActualInstance()).keySet()) {
if ((({{{dataType}}})getActualInstance()).get(_key) != null) { if ((({{{dataType}}})getActualInstance()).get(_key) != null) {
joiner.add((({{{items.dataType}}})getActualInstance()).get(_key).toUrlQueryString(String.format("%s{{baseName}}%s%s", prefix, suffix, joiner.add((({{{items.dataType}}})getActualInstance()).get(_key).toUrlQueryString(String.format(Locale.ROOT, "%s{{baseName}}%s%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix)))); "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, _key, containerSuffix))));
} }
} }
} }
@ -369,7 +370,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
{{^isMap}} {{^isMap}}
{{#isPrimitiveType}} {{#isPrimitiveType}}
if (getActualInstance() != null) { if (getActualInstance() != null) {
joiner.add(String.format("%s{{{baseName}}}%s=%s", prefix, suffix, ApiClient.urlEncode(String.valueOf(getActualInstance())))); joiner.add(String.format(Locale.ROOT, "%s{{{baseName}}}%s=%s", prefix, suffix, ApiClient.urlEncode(String.valueOf(getActualInstance()))));
} }
{{/isPrimitiveType}} {{/isPrimitiveType}}
{{^isPrimitiveType}} {{^isPrimitiveType}}
@ -380,7 +381,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
{{/isModel}} {{/isModel}}
{{^isModel}} {{^isModel}}
if (getActualInstance() != null) { if (getActualInstance() != null) {
joiner.add(String.format("%s{{{baseName}}}%s=%s", prefix, suffix, ApiClient.urlEncode(String.valueOf(getActualInstance())))); joiner.add(String.format(Locale.ROOT, "%s{{{baseName}}}%s=%s", prefix, suffix, ApiClient.urlEncode(String.valueOf(getActualInstance()))));
} }
{{/isModel}} {{/isModel}}
{{/isPrimitiveType}} {{/isPrimitiveType}}

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

@ -389,8 +389,8 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
if ({{getter}}() != null) { if ({{getter}}() != null) {
int i = 0; int i = 0;
for ({{{items.dataType}}} _item : {{getter}}()) { for ({{{items.dataType}}} _item : {{getter}}()) {
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
ApiClient.urlEncode(ApiClient.valueToString(_item)))); ApiClient.urlEncode(ApiClient.valueToString(_item))));
} }
i++; i++;
@ -399,8 +399,8 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
{{^uniqueItems}} {{^uniqueItems}}
if ({{getter}}() != null) { if ({{getter}}() != null) {
for (int i = 0; i < {{getter}}().size(); i++) { for (int i = 0; i < {{getter}}().size(); i++) {
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
ApiClient.urlEncode(ApiClient.valueToString({{getter}}().get(i))))); ApiClient.urlEncode(ApiClient.valueToString({{getter}}().get(i)))));
} }
} }
@ -413,8 +413,8 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
int i = 0; int i = 0;
for ({{{items.dataType}}} _item : {{getter}}()) { for ({{{items.dataType}}} _item : {{getter}}()) {
if (_item != null) { if (_item != null) {
joiner.add(_item.toUrlQueryString(String.format("%s{{baseName}}%s%s", prefix, suffix, joiner.add(_item.toUrlQueryString(String.format(Locale.ROOT, "%s{{baseName}}%s%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix)))); "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix))));
} }
} }
i++; i++;
@ -424,8 +424,8 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
if ({{getter}}() != null) { if ({{getter}}() != null) {
for (int i = 0; i < {{getter}}().size(); i++) { for (int i = 0; i < {{getter}}().size(); i++) {
if ({{getter}}().get(i) != null) { if ({{getter}}().get(i) != null) {
joiner.add({{getter}}().get(i).toUrlQueryString(String.format("%s{{baseName}}%s%s", prefix, suffix, joiner.add({{getter}}().get(i).toUrlQueryString(String.format(Locale.ROOT, "%s{{baseName}}%s%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix)))); "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix))));
} }
} }
} }
@ -437,8 +437,8 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
int i = 0; int i = 0;
for ({{{items.dataType}}} _item : {{getter}}()) { for ({{{items.dataType}}} _item : {{getter}}()) {
if (_item != null) { if (_item != null) {
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
ApiClient.urlEncode(ApiClient.valueToString(_item)))); ApiClient.urlEncode(ApiClient.valueToString(_item))));
} }
i++; i++;
@ -449,8 +449,8 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
if ({{getter}}() != null) { if ({{getter}}() != null) {
for (int i = 0; i < {{getter}}().size(); i++) { for (int i = 0; i < {{getter}}().size(); i++) {
if ({{getter}}().get(i) != null) { if ({{getter}}().get(i) != null) {
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
ApiClient.urlEncode(ApiClient.valueToString({{getter}}().get(i))))); ApiClient.urlEncode(ApiClient.valueToString({{getter}}().get(i)))));
} }
} }
@ -464,8 +464,8 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
{{^items.isModel}} {{^items.isModel}}
if ({{getter}}() != null) { if ({{getter}}() != null) {
for (String _key : {{getter}}().keySet()) { for (String _key : {{getter}}().keySet()) {
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, _key, containerSuffix),
{{getter}}().get(_key), ApiClient.urlEncode(ApiClient.valueToString({{getter}}().get(_key))))); {{getter}}().get(_key), ApiClient.urlEncode(ApiClient.valueToString({{getter}}().get(_key)))));
} }
} }
@ -474,8 +474,8 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
if ({{getter}}() != null) { if ({{getter}}() != null) {
for (String _key : {{getter}}().keySet()) { for (String _key : {{getter}}().keySet()) {
if ({{getter}}().get(_key) != null) { if ({{getter}}().get(_key) != null) {
joiner.add({{getter}}().get(_key).toUrlQueryString(String.format("%s{{baseName}}%s%s", prefix, suffix, joiner.add({{getter}}().get(_key).toUrlQueryString(String.format(Locale.ROOT, "%s{{baseName}}%s%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix)))); "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, _key, containerSuffix))));
} }
} }
} }
@ -484,7 +484,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
{{^isMap}} {{^isMap}}
{{#isPrimitiveType}} {{#isPrimitiveType}}
if ({{getter}}() != null) { if ({{getter}}() != null) {
joiner.add(String.format("%s{{{baseName}}}%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString({{{getter}}}())))); joiner.add(String.format(Locale.ROOT, "%s{{{baseName}}}%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString({{{getter}}}()))));
} }
{{/isPrimitiveType}} {{/isPrimitiveType}}
{{^isPrimitiveType}} {{^isPrimitiveType}}
@ -495,7 +495,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
{{/isModel}} {{/isModel}}
{{^isModel}} {{^isModel}}
if ({{getter}}() != null) { if ({{getter}}() != null) {
joiner.add(String.format("%s{{{baseName}}}%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString({{{getter}}}())))); joiner.add(String.format(Locale.ROOT, "%s{{{baseName}}}%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString({{{getter}}}()))));
} }
{{/isModel}} {{/isModel}}
{{/isPrimitiveType}} {{/isPrimitiveType}}

5
modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache vendored
View File

@ -1546,6 +1546,7 @@ public class ApiClient {
if (serverIndex != null) { if (serverIndex != null) {
if (serverIndex < 0 || serverIndex >= servers.size()) { if (serverIndex < 0 || serverIndex >= servers.size()) {
throw new ArrayIndexOutOfBoundsException(String.format( throw new ArrayIndexOutOfBoundsException(String.format(
Locale.ROOT,
"Invalid index %d when selecting the host settings. Must be less than %d", serverIndex, servers.size() "Invalid index %d when selecting the host settings. Must be less than %d", serverIndex, servers.size()
)); ));
} }
@ -1618,11 +1619,11 @@ public class ApiClient {
*/ */
public void processCookieParams(Map<String, String> cookieParams, Request.Builder reqBuilder) { public void processCookieParams(Map<String, String> cookieParams, Request.Builder reqBuilder) {
for (Entry<String, String> param : cookieParams.entrySet()) { for (Entry<String, String> param : cookieParams.entrySet()) {
reqBuilder.addHeader("Cookie", String.format("%s=%s", param.getKey(), param.getValue())); reqBuilder.addHeader("Cookie", String.format(Locale.ROOT, "%s=%s", param.getKey(), param.getValue()));
} }
for (Entry<String, String> param : defaultCookieMap.entrySet()) { for (Entry<String, String> param : defaultCookieMap.entrySet()) {
if (!cookieParams.containsKey(param.getKey())) { if (!cookieParams.containsKey(param.getKey())) {
reqBuilder.addHeader("Cookie", String.format("%s=%s", param.getKey(), param.getValue())); reqBuilder.addHeader("Cookie", String.format(Locale.ROOT, "%s=%s", param.getKey(), param.getValue()));
} }
} }
} }

31
modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/anyof_model.mustache vendored
View File

@ -10,6 +10,7 @@ import java.util.HashSet;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Locale;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
@ -120,14 +121,14 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
{{^isArray}} {{^isArray}}
{{#isNumber}} {{#isNumber}}
if (!jsonElement.getAsJsonPrimitive().isNumber()) { if (!jsonElement.getAsJsonPrimitive().isNumber()) {
throw new IllegalArgumentException(String.format("Expected json element to be of type Number in the JSON string but got `%s`", jsonElement.toString())); throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected json element to be of type Number in the JSON string but got `%s`", jsonElement.toString()));
} }
actualAdapter = adapter{{#sanitizeDataType}}{{{dataType}}}{{/sanitizeDataType}}; actualAdapter = adapter{{#sanitizeDataType}}{{{dataType}}}{{/sanitizeDataType}};
{{/isNumber}} {{/isNumber}}
{{^isNumber}} {{^isNumber}}
{{#isPrimitiveType}} {{#isPrimitiveType}}
if (!jsonElement.getAsJsonPrimitive().is{{#isBoolean}}Boolean{{/isBoolean}}{{#isString}}String{{/isString}}{{^isString}}{{^isBoolean}}Number{{/isBoolean}}{{/isString}}()) { if (!jsonElement.getAsJsonPrimitive().is{{#isBoolean}}Boolean{{/isBoolean}}{{#isString}}String{{/isString}}{{^isString}}{{^isBoolean}}Number{{/isBoolean}}{{/isString}}()) {
throw new IllegalArgumentException(String.format("Expected json element to be of type {{#isBoolean}}Boolean{{/isBoolean}}{{#isString}}String{{/isString}}{{^isString}}{{^isBoolean}}Number{{/isBoolean}}{{/isString}} in the JSON string but got `%s`", jsonElement.toString())); throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected json element to be of type {{#isBoolean}}Boolean{{/isBoolean}}{{#isString}}String{{/isString}}{{^isString}}{{^isBoolean}}Number{{/isBoolean}}{{/isString}} in the JSON string but got `%s`", jsonElement.toString()));
} }
actualAdapter = adapter{{#sanitizeDataType}}{{{dataType}}}{{/sanitizeDataType}}; actualAdapter = adapter{{#sanitizeDataType}}{{{dataType}}}{{/sanitizeDataType}};
{{/isPrimitiveType}} {{/isPrimitiveType}}
@ -146,7 +147,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
{{/isArray}} {{/isArray}}
{{#isArray}} {{#isArray}}
if (!jsonElement.isJsonArray()) { if (!jsonElement.isJsonArray()) {
throw new IllegalArgumentException(String.format("Expected json element to be a array type in the JSON string but got `%s`", jsonElement.toString())); throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected json element to be a array type in the JSON string but got `%s`", jsonElement.toString()));
} }
JsonArray array = jsonElement.getAsJsonArray(); JsonArray array = jsonElement.getAsJsonArray();
@ -155,13 +156,13 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
{{#items}} {{#items}}
{{#isNumber}} {{#isNumber}}
if (!jsonElement.getAsJsonPrimitive().isNumber()) { if (!jsonElement.getAsJsonPrimitive().isNumber()) {
throw new IllegalArgumentException(String.format("Expected json element to be of type Number in the JSON string but got `%s`", jsonElement.toString())); throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected json element to be of type Number in the JSON string but got `%s`", jsonElement.toString()));
} }
{{/isNumber}} {{/isNumber}}
{{^isNumber}} {{^isNumber}}
{{#isPrimitiveType}} {{#isPrimitiveType}}
if (!element.getAsJsonPrimitive().is{{#isBoolean}}Boolean{{/isBoolean}}{{#isString}}String{{/isString}}{{^isString}}{{^isBoolean}}Number{{/isBoolean}}{{/isString}}()) { if (!element.getAsJsonPrimitive().is{{#isBoolean}}Boolean{{/isBoolean}}{{#isString}}String{{/isString}}{{^isString}}{{^isBoolean}}Number{{/isBoolean}}{{/isString}}()) {
throw new IllegalArgumentException(String.format("Expected array items to be of type {{#isBoolean}}Boolean{{/isBoolean}}{{#isString}}String{{/isString}}{{^isString}}{{^isBoolean}}Number{{/isBoolean}}{{/isString}} in the JSON string but got `%s`", jsonElement.toString())); throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected array items to be of type {{#isBoolean}}Boolean{{/isBoolean}}{{#isString}}String{{/isString}}{{^isString}}{{^isBoolean}}Number{{/isBoolean}}{{/isString}} in the JSON string but got `%s`", jsonElement.toString()));
} }
{{/isPrimitiveType}} {{/isPrimitiveType}}
{{/isNumber}} {{/isNumber}}
@ -179,7 +180,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
return ret; return ret;
} catch (Exception e) { } catch (Exception e) {
// deserialization failed, continue // deserialization failed, continue
errorMessages.add(String.format("Deserialization for {{{dataType}}} failed with `%s`.", e.getMessage())); errorMessages.add(String.format(Locale.ROOT, "Deserialization for {{{dataType}}} failed with `%s`.", e.getMessage()));
log.log(Level.FINER, "Input data does not match schema '{{{dataType}}}'", e); log.log(Level.FINER, "Input data does not match schema '{{{dataType}}}'", e);
} }
{{/hasVars}} {{/hasVars}}
@ -194,7 +195,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
return ret; return ret;
} catch (Exception e) { } catch (Exception e) {
// deserialization failed, continue // deserialization failed, continue
errorMessages.add(String.format("Deserialization for {{{.}}} failed with `%s`.", e.getMessage())); errorMessages.add(String.format(Locale.ROOT, "Deserialization for {{{.}}} failed with `%s`.", e.getMessage()));
log.log(Level.FINER, "Input data does not match schema '{{{.}}}'", e); log.log(Level.FINER, "Input data does not match schema '{{{.}}}'", e);
} }
{{/hasVars}} {{/hasVars}}
@ -202,7 +203,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
{{/anyOf}} {{/anyOf}}
{{/composedSchemas}} {{/composedSchemas}}
throw new IOException(String.format("Failed deserialization for {{classname}}: no class matches result, expected at least 1. Detailed failure message for anyOf schemas: %s. JSON: %s", errorMessages, jsonElement.toString())); throw new IOException(String.format(Locale.ROOT, "Failed deserialization for {{classname}}: no class matches result, expected at least 1. Detailed failure message for anyOf schemas: %s. JSON: %s", errorMessages, jsonElement.toString()));
} }
}.nullSafe(); }.nullSafe();
} }
@ -321,13 +322,13 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
{{^isArray}} {{^isArray}}
{{#isNumber}} {{#isNumber}}
if (!jsonElement.getAsJsonPrimitive().isNumber()) { if (!jsonElement.getAsJsonPrimitive().isNumber()) {
throw new IllegalArgumentException(String.format("Expected json element to be of type Number in the JSON string but got `%s`", jsonElement.toString())); throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected json element to be of type Number in the JSON string but got `%s`", jsonElement.toString()));
} }
{{/isNumber}} {{/isNumber}}
{{^isNumber}} {{^isNumber}}
{{#isPrimitiveType}} {{#isPrimitiveType}}
if (!jsonElement.getAsJsonPrimitive().is{{#isBoolean}}Boolean{{/isBoolean}}{{#isString}}String{{/isString}}{{^isString}}{{^isBoolean}}Number{{/isBoolean}}{{/isString}}()) { if (!jsonElement.getAsJsonPrimitive().is{{#isBoolean}}Boolean{{/isBoolean}}{{#isString}}String{{/isString}}{{^isString}}{{^isBoolean}}Number{{/isBoolean}}{{/isString}}()) {
throw new IllegalArgumentException(String.format("Expected json element to be of type {{#isBoolean}}Boolean{{/isBoolean}}{{#isString}}String{{/isString}}{{^isString}}{{^isBoolean}}Number{{/isBoolean}}{{/isString}} in the JSON string but got `%s`", jsonElement.toString())); throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected json element to be of type {{#isBoolean}}Boolean{{/isBoolean}}{{#isString}}String{{/isString}}{{^isString}}{{^isBoolean}}Number{{/isBoolean}}{{/isString}} in the JSON string but got `%s`", jsonElement.toString()));
} }
{{/isPrimitiveType}} {{/isPrimitiveType}}
{{/isNumber}} {{/isNumber}}
@ -344,7 +345,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
{{/isArray}} {{/isArray}}
{{#isArray}} {{#isArray}}
if (!jsonElement.isJsonArray()) { if (!jsonElement.isJsonArray()) {
throw new IllegalArgumentException(String.format("Expected json element to be a array type in the JSON string but got `%s`", jsonElement.toString())); throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected json element to be a array type in the JSON string but got `%s`", jsonElement.toString()));
} }
JsonArray array = jsonElement.getAsJsonArray(); JsonArray array = jsonElement.getAsJsonArray();
// validate array items // validate array items
@ -352,13 +353,13 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
{{#items}} {{#items}}
{{#isNumber}} {{#isNumber}}
if (!jsonElement.getAsJsonPrimitive().isNumber()) { if (!jsonElement.getAsJsonPrimitive().isNumber()) {
throw new IllegalArgumentException(String.format("Expected json element to be of type Number in the JSON string but got `%s`", jsonElement.toString())); throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected json element to be of type Number in the JSON string but got `%s`", jsonElement.toString()));
} }
{{/isNumber}} {{/isNumber}}
{{^isNumber}} {{^isNumber}}
{{#isPrimitiveType}} {{#isPrimitiveType}}
if (!element.getAsJsonPrimitive().is{{#isBoolean}}Boolean{{/isBoolean}}{{#isString}}String{{/isString}}{{^isString}}{{^isBoolean}}Number{{/isBoolean}}{{/isString}}()) { if (!element.getAsJsonPrimitive().is{{#isBoolean}}Boolean{{/isBoolean}}{{#isString}}String{{/isString}}{{^isString}}{{^isBoolean}}Number{{/isBoolean}}{{/isString}}()) {
throw new IllegalArgumentException(String.format("Expected array items to be of type {{#isBoolean}}Boolean{{/isBoolean}}{{#isString}}String{{/isString}}{{^isString}}{{^isBoolean}}Number{{/isBoolean}}{{/isString}} in the JSON string but got `%s`", jsonElement.toString())); throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected array items to be of type {{#isBoolean}}Boolean{{/isBoolean}}{{#isString}}String{{/isString}}{{^isString}}{{^isBoolean}}Number{{/isBoolean}}{{/isString}} in the JSON string but got `%s`", jsonElement.toString()));
} }
{{/isPrimitiveType}} {{/isPrimitiveType}}
{{/isNumber}} {{/isNumber}}
@ -377,13 +378,13 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
{{/hasVars}} {{/hasVars}}
return; return;
} catch (Exception e) { } catch (Exception e) {
errorMessages.add(String.format("Deserialization for {{{dataType}}} failed with `%s`.", e.getMessage())); errorMessages.add(String.format(Locale.ROOT, "Deserialization for {{{dataType}}} failed with `%s`.", e.getMessage()));
// continue to the next one // continue to the next one
} }
{{/vendorExtensions.x-duplicated-data-type}} {{/vendorExtensions.x-duplicated-data-type}}
{{/anyOf}} {{/anyOf}}
{{/composedSchemas}} {{/composedSchemas}}
throw new IOException(String.format("The JSON string is invalid for {{classname}} with anyOf schemas: {{#anyOf}}{{{.}}}{{^-last}}, {{/-last}}{{/anyOf}}. no class match the result, expected at least 1. Detailed failure message for anyOf schemas: %s. JSON: %s", errorMessages, jsonElement.toString())); throw new IOException(String.format(Locale.ROOT, "The JSON string is invalid for {{classname}} with anyOf schemas: {{#anyOf}}{{{.}}}{{^-last}}, {{/-last}}{{/anyOf}}. no class match the result, expected at least 1. Detailed failure message for anyOf schemas: %s. JSON: %s", errorMessages, jsonElement.toString()));
} }
/** /**

3
modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/apiException.mustache vendored
View File

@ -4,6 +4,7 @@ package {{invokerPackage}};
import java.util.Map; import java.util.Map;
import java.util.List; import java.util.List;
import java.util.Locale;
{{#caseInsensitiveResponseHeaders}} {{#caseInsensitiveResponseHeaders}}
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.TreeMap; import java.util.TreeMap;
@ -170,7 +171,7 @@ public class ApiException extends{{#useRuntimeException}} RuntimeException {{/us
* @return The exception message * @return The exception message
*/ */
public String getMessage() { public String getMessage() {
return String.format("Message: %s%nHTTP response code: %s%nHTTP response body: %s%nHTTP response headers: %s", return String.format(Locale.ROOT, "Message: %s%nHTTP response code: %s%nHTTP response body: %s%nHTTP response headers: %s",
super.getMessage(), this.getCode(), this.getResponseBody(), this.getResponseHeaders()); super.getMessage(), this.getCode(), this.getResponseBody(), this.getResponseHeaders());
} }
{{#errorObjectType}} {{#errorObjectType}}

1
modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/model.mustache vendored
View File

@ -7,6 +7,7 @@ import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder;
{{/useReflectionEqualsHashCode}} {{/useReflectionEqualsHashCode}}
import java.util.Objects; import java.util.Objects;
import java.util.Locale;
{{#imports}} {{#imports}}
import {{import}}; import {{import}};
{{/imports}} {{/imports}}

3
modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/modelEnum.mustache vendored
View File

@ -2,6 +2,7 @@ import java.io.IOException;
{{#isUri}} {{#isUri}}
import java.net.URI; import java.net.URI;
{{/isUri}} {{/isUri}}
import java.util.Locale;
import com.google.gson.TypeAdapter; import com.google.gson.TypeAdapter;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.google.gson.annotations.JsonAdapter; import com.google.gson.annotations.JsonAdapter;
@ -79,7 +80,7 @@ import com.google.gson.stream.JsonWriter;
prefix = ""; prefix = "";
} }
return String.format("%s=%s", prefix, this.toString()); return String.format(Locale.ROOT, "%s=%s", prefix, this.toString());
} }
{{/supportUrlQuery}} {{/supportUrlQuery}}
} }

45
modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/oneof_model.mustache vendored
View File

@ -10,6 +10,7 @@ import java.util.HashSet;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Locale;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
@ -140,7 +141,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
return new{{classname}}; return new{{classname}};
{{/mappedModels}} {{/mappedModels}}
default: default:
log.log(Level.WARNING, String.format("Failed to lookup discriminator value `%s` for {{classname}}. Possible values:{{#mappedModels}} {{{mappingName}}}{{/mappedModels}}", jsonObject.get("{{{propertyBaseName}}}").getAsString())); log.log(Level.WARNING, String.format(Locale.ROOT, "Failed to lookup discriminator value `%s` for {{classname}}. Possible values:{{#mappedModels}} {{{mappingName}}}{{/mappedModels}}", jsonObject.get("{{{propertyBaseName}}}").getAsString()));
} }
} }
@ -161,14 +162,14 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
{{^isMap}} {{^isMap}}
{{#isNumber}} {{#isNumber}}
if (!jsonElement.getAsJsonPrimitive().isNumber()) { if (!jsonElement.getAsJsonPrimitive().isNumber()) {
throw new IllegalArgumentException(String.format("Expected json element to be of type Number in the JSON string but got `%s`", jsonElement.toString())); throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected json element to be of type Number in the JSON string but got `%s`", jsonElement.toString()));
} }
actualAdapter = adapter{{#sanitizeDataType}}{{{dataType}}}{{/sanitizeDataType}}; actualAdapter = adapter{{#sanitizeDataType}}{{{dataType}}}{{/sanitizeDataType}};
{{/isNumber}} {{/isNumber}}
{{^isNumber}} {{^isNumber}}
{{#isPrimitiveType}} {{#isPrimitiveType}}
if (!jsonElement.getAsJsonPrimitive().is{{#isBoolean}}Boolean{{/isBoolean}}{{#isString}}String{{/isString}}{{^isString}}{{^isBoolean}}Number{{/isBoolean}}{{/isString}}()) { if (!jsonElement.getAsJsonPrimitive().is{{#isBoolean}}Boolean{{/isBoolean}}{{#isString}}String{{/isString}}{{^isString}}{{^isBoolean}}Number{{/isBoolean}}{{/isString}}()) {
throw new IllegalArgumentException(String.format("Expected json element to be of type {{#isBoolean}}Boolean{{/isBoolean}}{{#isString}}String{{/isString}}{{^isString}}{{^isBoolean}}Number{{/isBoolean}}{{/isString}} in the JSON string but got `%s`", jsonElement.toString())); throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected json element to be of type {{#isBoolean}}Boolean{{/isBoolean}}{{#isString}}String{{/isString}}{{^isString}}{{^isBoolean}}Number{{/isBoolean}}{{/isString}} in the JSON string but got `%s`", jsonElement.toString()));
} }
actualAdapter = adapter{{#sanitizeDataType}}{{{dataType}}}{{/sanitizeDataType}}; actualAdapter = adapter{{#sanitizeDataType}}{{{dataType}}}{{/sanitizeDataType}};
{{/isPrimitiveType}} {{/isPrimitiveType}}
@ -188,7 +189,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
{{/isArray}} {{/isArray}}
{{#isArray}} {{#isArray}}
if (!jsonElement.isJsonArray()) { if (!jsonElement.isJsonArray()) {
throw new IllegalArgumentException(String.format("Expected json element to be a array type in the JSON string but got `%s`", jsonElement.toString())); throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected json element to be a array type in the JSON string but got `%s`", jsonElement.toString()));
} }
JsonArray array = jsonElement.getAsJsonArray(); JsonArray array = jsonElement.getAsJsonArray();
@ -197,13 +198,13 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
{{#items}} {{#items}}
{{#isNumber}} {{#isNumber}}
if (!jsonElement.getAsJsonPrimitive().isNumber()) { if (!jsonElement.getAsJsonPrimitive().isNumber()) {
throw new IllegalArgumentException(String.format("Expected json element to be of type Number in the JSON string but got `%s`", jsonElement.toString())); throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected json element to be of type Number in the JSON string but got `%s`", jsonElement.toString()));
} }
{{/isNumber}} {{/isNumber}}
{{^isNumber}} {{^isNumber}}
{{#isPrimitiveType}} {{#isPrimitiveType}}
if (!element.getAsJsonPrimitive().is{{#isBoolean}}Boolean{{/isBoolean}}{{#isString}}String{{/isString}}{{^isString}}{{^isBoolean}}Number{{/isBoolean}}{{/isString}}()) { if (!element.getAsJsonPrimitive().is{{#isBoolean}}Boolean{{/isBoolean}}{{#isString}}String{{/isString}}{{^isString}}{{^isBoolean}}Number{{/isBoolean}}{{/isString}}()) {
throw new IllegalArgumentException(String.format("Expected array items to be of type {{#isBoolean}}Boolean{{/isBoolean}}{{#isString}}String{{/isString}}{{^isString}}{{^isBoolean}}Number{{/isBoolean}}{{/isString}} in the JSON string but got `%s`", jsonElement.toString())); throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected array items to be of type {{#isBoolean}}Boolean{{/isBoolean}}{{#isString}}String{{/isString}}{{^isString}}{{^isBoolean}}Number{{/isBoolean}}{{/isString}} in the JSON string but got `%s`", jsonElement.toString()));
} }
{{/isPrimitiveType}} {{/isPrimitiveType}}
{{/isNumber}} {{/isNumber}}
@ -218,7 +219,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
{{/isArray}} {{/isArray}}
{{#isMap}} {{#isMap}}
if (!jsonElement.isJsonObject()) { if (!jsonElement.isJsonObject()) {
throw new IllegalArgumentException(String.format("Expected json element to be a object type in the JSON string but got `%s`", jsonElement.toString())); throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected json element to be a object type in the JSON string but got `%s`", jsonElement.toString()));
} }
{{^isFreeFormObject}} {{^isFreeFormObject}}
@ -228,13 +229,13 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
{{#items}} {{#items}}
{{#isNumber}} {{#isNumber}}
if (!jsonElement.getAsJsonPrimitive().isNumber()) { if (!jsonElement.getAsJsonPrimitive().isNumber()) {
throw new IllegalArgumentException(String.format("Expected json element to be of type Number in the JSON string but got `%s`", jsonElement.toString())); throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected json element to be of type Number in the JSON string but got `%s`", jsonElement.toString()));
} }
{{/isNumber}} {{/isNumber}}
{{^isNumber}} {{^isNumber}}
{{#isPrimitiveType}} {{#isPrimitiveType}}
if (!element.getAsJsonPrimitive().is{{#isBoolean}}Boolean{{/isBoolean}}{{#isString}}String{{/isString}}{{^isString}}{{^isBoolean}}Number{{/isBoolean}}{{/isString}}()) { if (!element.getAsJsonPrimitive().is{{#isBoolean}}Boolean{{/isBoolean}}{{#isString}}String{{/isString}}{{^isString}}{{^isBoolean}}Number{{/isBoolean}}{{/isString}}()) {
throw new IllegalArgumentException(String.format("Expected array items to be of type {{#isBoolean}}Boolean{{/isBoolean}}{{#isString}}String{{/isString}}{{^isString}}{{^isBoolean}}Number{{/isBoolean}}{{/isString}} in the JSON string but got `%s`", jsonElement.toString())); throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected array items to be of type {{#isBoolean}}Boolean{{/isBoolean}}{{#isString}}String{{/isString}}{{^isString}}{{^isBoolean}}Number{{/isBoolean}}{{/isString}} in the JSON string but got `%s`", jsonElement.toString()));
} }
{{/isPrimitiveType}} {{/isPrimitiveType}}
{{/isNumber}} {{/isNumber}}
@ -252,7 +253,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
log.log(Level.FINER, "Input data matches schema '{{{dataType}}}'"); log.log(Level.FINER, "Input data matches schema '{{{dataType}}}'");
} catch (Exception e) { } catch (Exception e) {
// deserialization failed, continue // deserialization failed, continue
errorMessages.add(String.format("Deserialization for {{{dataType}}} failed with `%s`.", e.getMessage())); errorMessages.add(String.format(Locale.ROOT, "Deserialization for {{{dataType}}} failed with `%s`.", e.getMessage()));
log.log(Level.FINER, "Input data does not match schema '{{{dataType}}}'", e); log.log(Level.FINER, "Input data does not match schema '{{{dataType}}}'", e);
} }
{{/hasVars}} {{/hasVars}}
@ -266,7 +267,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
log.log(Level.FINER, "Input data matches schema '{{{.}}}'"); log.log(Level.FINER, "Input data matches schema '{{{.}}}'");
} catch (Exception e) { } catch (Exception e) {
// deserialization failed, continue // deserialization failed, continue
errorMessages.add(String.format("Deserialization for {{{.}}} failed with `%s`.", e.getMessage())); errorMessages.add(String.format(Locale.ROOT, "Deserialization for {{{.}}} failed with `%s`.", e.getMessage()));
log.log(Level.FINER, "Input data does not match schema '{{{.}}}'", e); log.log(Level.FINER, "Input data does not match schema '{{{.}}}'", e);
} }
{{/hasVars}} {{/hasVars}}
@ -280,7 +281,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
return ret; return ret;
} }
throw new IOException(String.format("Failed deserialization for {{classname}}: %d classes match result, expected 1. Detailed failure message for oneOf schemas: %s. JSON: %s", match, errorMessages, jsonElement.toString())); throw new IOException(String.format(Locale.ROOT, "Failed deserialization for {{classname}}: %d classes match result, expected 1. Detailed failure message for oneOf schemas: %s. JSON: %s", match, errorMessages, jsonElement.toString()));
} }
}.nullSafe(); }.nullSafe();
} }
@ -401,13 +402,13 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
{{^isArray}} {{^isArray}}
{{#isNumber}} {{#isNumber}}
if (!jsonElement.getAsJsonPrimitive().isNumber()) { if (!jsonElement.getAsJsonPrimitive().isNumber()) {
throw new IllegalArgumentException(String.format("Expected json element to be of type Number in the JSON string but got `%s`", jsonElement.toString())); throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected json element to be of type Number in the JSON string but got `%s`", jsonElement.toString()));
} }
{{/isNumber}} {{/isNumber}}
{{^isNumber}} {{^isNumber}}
{{#isPrimitiveType}} {{#isPrimitiveType}}
if (!jsonElement.getAsJsonPrimitive().is{{#isBoolean}}Boolean{{/isBoolean}}{{#isString}}String{{/isString}}{{^isString}}{{^isBoolean}}Number{{/isBoolean}}{{/isString}}()) { if (!jsonElement.getAsJsonPrimitive().is{{#isBoolean}}Boolean{{/isBoolean}}{{#isString}}String{{/isString}}{{^isString}}{{^isBoolean}}Number{{/isBoolean}}{{/isString}}()) {
throw new IllegalArgumentException(String.format("Expected json element to be of type {{#isBoolean}}Boolean{{/isBoolean}}{{#isString}}String{{/isString}}{{^isString}}{{^isBoolean}}Number{{/isBoolean}}{{/isString}} in the JSON string but got `%s`", jsonElement.toString())); throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected json element to be of type {{#isBoolean}}Boolean{{/isBoolean}}{{#isString}}String{{/isString}}{{^isString}}{{^isBoolean}}Number{{/isBoolean}}{{/isString}} in the JSON string but got `%s`", jsonElement.toString()));
} }
{{/isPrimitiveType}} {{/isPrimitiveType}}
{{/isNumber}} {{/isNumber}}
@ -425,7 +426,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
{{/isMap}} {{/isMap}}
{{#isArray}} {{#isArray}}
if (!jsonElement.isJsonArray()) { if (!jsonElement.isJsonArray()) {
throw new IllegalArgumentException(String.format("Expected json element to be a array type in the JSON string but got `%s`", jsonElement.toString())); throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected json element to be a array type in the JSON string but got `%s`", jsonElement.toString()));
} }
JsonArray array = jsonElement.getAsJsonArray(); JsonArray array = jsonElement.getAsJsonArray();
// validate array items // validate array items
@ -433,13 +434,13 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
{{#items}} {{#items}}
{{#isNumber}} {{#isNumber}}
if (!jsonElement.getAsJsonPrimitive().isNumber()) { if (!jsonElement.getAsJsonPrimitive().isNumber()) {
throw new IllegalArgumentException(String.format("Expected json element to be of type Number in the JSON string but got `%s`", jsonElement.toString())); throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected json element to be of type Number in the JSON string but got `%s`", jsonElement.toString()));
} }
{{/isNumber}} {{/isNumber}}
{{^isNumber}} {{^isNumber}}
{{#isPrimitiveType}} {{#isPrimitiveType}}
if (!element.getAsJsonPrimitive().is{{#isBoolean}}Boolean{{/isBoolean}}{{#isString}}String{{/isString}}{{^isString}}{{^isBoolean}}Number{{/isBoolean}}{{/isString}}()) { if (!element.getAsJsonPrimitive().is{{#isBoolean}}Boolean{{/isBoolean}}{{#isString}}String{{/isString}}{{^isString}}{{^isBoolean}}Number{{/isBoolean}}{{/isString}}()) {
throw new IllegalArgumentException(String.format("Expected array items to be of type {{#isBoolean}}Boolean{{/isBoolean}}{{#isString}}String{{/isString}}{{^isString}}{{^isBoolean}}Number{{/isBoolean}}{{/isString}} in the JSON string but got `%s`", jsonElement.toString())); throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected array items to be of type {{#isBoolean}}Boolean{{/isBoolean}}{{#isString}}String{{/isString}}{{^isString}}{{^isBoolean}}Number{{/isBoolean}}{{/isString}} in the JSON string but got `%s`", jsonElement.toString()));
} }
{{/isPrimitiveType}} {{/isPrimitiveType}}
{{/isNumber}} {{/isNumber}}
@ -453,7 +454,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
{{/isArray}} {{/isArray}}
{{#isMap}} {{#isMap}}
if (!jsonElement.isJsonObject()) { if (!jsonElement.isJsonObject()) {
throw new IllegalArgumentException(String.format("Expected json element to be a object type in the JSON string but got `%s`", jsonElement.toString())); throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected json element to be a object type in the JSON string but got `%s`", jsonElement.toString()));
} }
{{^isFreeFormObject}} {{^isFreeFormObject}}
@ -463,13 +464,13 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
{{#items}} {{#items}}
{{#isNumber}} {{#isNumber}}
if (!jsonElement.getAsJsonPrimitive().isNumber()) { if (!jsonElement.getAsJsonPrimitive().isNumber()) {
throw new IllegalArgumentException(String.format("Expected json element to be of type Number in the JSON string but got `%s`", jsonElement.toString())); throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected json element to be of type Number in the JSON string but got `%s`", jsonElement.toString()));
} }
{{/isNumber}} {{/isNumber}}
{{^isNumber}} {{^isNumber}}
{{#isPrimitiveType}} {{#isPrimitiveType}}
if (!element.getAsJsonPrimitive().is{{#isBoolean}}Boolean{{/isBoolean}}{{#isString}}String{{/isString}}{{^isString}}{{^isBoolean}}Number{{/isBoolean}}{{/isString}}()) { if (!element.getAsJsonPrimitive().is{{#isBoolean}}Boolean{{/isBoolean}}{{#isString}}String{{/isString}}{{^isString}}{{^isBoolean}}Number{{/isBoolean}}{{/isString}}()) {
throw new IllegalArgumentException(String.format("Expected array items to be of type {{#isBoolean}}Boolean{{/isBoolean}}{{#isString}}String{{/isString}}{{^isString}}{{^isBoolean}}Number{{/isBoolean}}{{/isString}} in the JSON string but got `%s`", jsonElement.toString())); throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected array items to be of type {{#isBoolean}}Boolean{{/isBoolean}}{{#isString}}String{{/isString}}{{^isString}}{{^isBoolean}}Number{{/isBoolean}}{{/isString}} in the JSON string but got `%s`", jsonElement.toString()));
} }
{{/isPrimitiveType}} {{/isPrimitiveType}}
{{/isNumber}} {{/isNumber}}
@ -489,14 +490,14 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
{{/hasVars}} {{/hasVars}}
validCount++; validCount++;
} catch (Exception e) { } catch (Exception e) {
errorMessages.add(String.format("Deserialization for {{{dataType}}} failed with `%s`.", e.getMessage())); errorMessages.add(String.format(Locale.ROOT, "Deserialization for {{{dataType}}} failed with `%s`.", e.getMessage()));
// continue to the next one // continue to the next one
} }
{{/vendorExtensions.x-duplicated-data-type}} {{/vendorExtensions.x-duplicated-data-type}}
{{/oneOf}} {{/oneOf}}
{{/composedSchemas}} {{/composedSchemas}}
if (validCount != 1) { if (validCount != 1) {
throw new IOException(String.format("The JSON string is invalid for {{classname}} with oneOf schemas: {{#oneOf}}{{{.}}}{{^-last}}, {{/-last}}{{/oneOf}}. %d class(es) match the result, expected 1. Detailed failure message for oneOf schemas: %s. JSON: %s", validCount, errorMessages, jsonElement.toString())); throw new IOException(String.format(Locale.ROOT, "The JSON string is invalid for {{classname}} with oneOf schemas: {{#oneOf}}{{{.}}}{{^-last}}, {{/-last}}{{/oneOf}}. %d class(es) match the result, expected 1. Detailed failure message for oneOf schemas: %s. JSON: %s", validCount, errorMessages, jsonElement.toString()));
} }
} }

21
modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache vendored
View File

@ -18,6 +18,7 @@ import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.Locale;
import {{invokerPackage}}.JSON; import {{invokerPackage}}.JSON;
@ -351,7 +352,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
public static void validateJsonElement(JsonElement jsonElement) throws IOException { public static void validateJsonElement(JsonElement jsonElement) throws IOException {
if (jsonElement == null) { if (jsonElement == null) {
if (!{{classname}}.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null if (!{{classname}}.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
throw new IllegalArgumentException(String.format("The required field(s) %s in {{{classname}}} is not found in the empty JSON string", {{classname}}.openapiRequiredFields.toString())); throw new IllegalArgumentException(String.format(Locale.ROOT, "The required field(s) %s in {{{classname}}} is not found in the empty JSON string", {{classname}}.openapiRequiredFields.toString()));
} }
} }
{{^hasChildren}} {{^hasChildren}}
@ -361,7 +362,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
// check to see if the JSON string contains additional fields // check to see if the JSON string contains additional fields
for (Map.Entry<String, JsonElement> entry : entries) { for (Map.Entry<String, JsonElement> entry : entries) {
if (!{{classname}}.openapiFields.contains(entry.getKey())) { if (!{{classname}}.openapiFields.contains(entry.getKey())) {
throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `{{classname}}` properties. JSON: %s", entry.getKey(), jsonElement.toString())); throw new IllegalArgumentException(String.format(Locale.ROOT, "The field `%s` in the JSON string is not defined in the `{{classname}}` properties. JSON: %s", entry.getKey(), jsonElement.toString()));
} }
} }
{{/isAdditionalPropertiesTrue}} {{/isAdditionalPropertiesTrue}}
@ -371,7 +372,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
// check to make sure all required properties/fields are present in the JSON string // check to make sure all required properties/fields are present in the JSON string
for (String requiredField : {{classname}}.openapiRequiredFields) { for (String requiredField : {{classname}}.openapiRequiredFields) {
if (jsonElement.getAsJsonObject().get(requiredField) == null) { if (jsonElement.getAsJsonObject().get(requiredField) == null) {
throw new IllegalArgumentException(String.format("The required field `%s` is not found in the JSON string: %s", requiredField, jsonElement.toString())); throw new IllegalArgumentException(String.format(Locale.ROOT, "The required field `%s` is not found in the JSON string: %s", requiredField, jsonElement.toString()));
} }
} }
{{/-first}} {{/-first}}
@ -387,7 +388,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
{{#required}} {{#required}}
// ensure the json data is an array // ensure the json data is an array
if (!jsonObj.get("{{{baseName}}}").isJsonArray()) { if (!jsonObj.get("{{{baseName}}}").isJsonArray()) {
throw new IllegalArgumentException(String.format("Expected the field `{{{baseName}}}` to be an array in the JSON string but got `%s`", jsonObj.get("{{{baseName}}}").toString())); throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected the field `{{{baseName}}}` to be an array in the JSON string but got `%s`", jsonObj.get("{{{baseName}}}").toString()));
} }
JsonArray jsonArray{{name}} = jsonObj.getAsJsonArray("{{{baseName}}}"); JsonArray jsonArray{{name}} = jsonObj.getAsJsonArray("{{{baseName}}}");
@ -402,7 +403,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
if (jsonArray{{name}} != null) { if (jsonArray{{name}} != null) {
// ensure the json data is an array // ensure the json data is an array
if (!jsonObj.get("{{{baseName}}}").isJsonArray()) { if (!jsonObj.get("{{{baseName}}}").isJsonArray()) {
throw new IllegalArgumentException(String.format("Expected the field `{{{baseName}}}` to be an array in the JSON string but got `%s`", jsonObj.get("{{{baseName}}}").toString())); throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected the field `{{{baseName}}}` to be an array in the JSON string but got `%s`", jsonObj.get("{{{baseName}}}").toString()));
} }
// validate the optional field `{{{baseName}}}` (array) // validate the optional field `{{{baseName}}}` (array)
@ -417,7 +418,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
{{^required}} {{^required}}
// ensure the optional json data is an array if present // ensure the optional json data is an array if present
if (jsonObj.get("{{{baseName}}}") != null && !jsonObj.get("{{{baseName}}}").isJsonNull() && !jsonObj.get("{{{baseName}}}").isJsonArray()) { if (jsonObj.get("{{{baseName}}}") != null && !jsonObj.get("{{{baseName}}}").isJsonNull() && !jsonObj.get("{{{baseName}}}").isJsonArray()) {
throw new IllegalArgumentException(String.format("Expected the field `{{{baseName}}}` to be an array in the JSON string but got `%s`", jsonObj.get("{{{baseName}}}").toString())); throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected the field `{{{baseName}}}` to be an array in the JSON string but got `%s`", jsonObj.get("{{{baseName}}}").toString()));
} }
{{/required}} {{/required}}
{{#required}} {{#required}}
@ -425,7 +426,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
if (jsonObj.get("{{{baseName}}}") == null) { if (jsonObj.get("{{{baseName}}}") == null) {
throw new IllegalArgumentException("Expected the field `linkedContent` to be an array in the JSON string but got `null`"); throw new IllegalArgumentException("Expected the field `linkedContent` to be an array in the JSON string but got `null`");
} else if (!jsonObj.get("{{{baseName}}}").isJsonArray()) { } else if (!jsonObj.get("{{{baseName}}}").isJsonArray()) {
throw new IllegalArgumentException(String.format("Expected the field `{{{baseName}}}` to be an array in the JSON string but got `%s`", jsonObj.get("{{{baseName}}}").toString())); throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected the field `{{{baseName}}}` to be an array in the JSON string but got `%s`", jsonObj.get("{{{baseName}}}").toString()));
} }
{{/required}} {{/required}}
{{/items.isModel}} {{/items.isModel}}
@ -433,7 +434,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
{{^isContainer}} {{^isContainer}}
{{#isString}} {{#isString}}
if ({{#notRequiredOrIsNullable}}(jsonObj.get("{{{baseName}}}") != null && !jsonObj.get("{{{baseName}}}").isJsonNull()) && {{/notRequiredOrIsNullable}}!jsonObj.get("{{{baseName}}}").isJsonPrimitive()) { if ({{#notRequiredOrIsNullable}}(jsonObj.get("{{{baseName}}}") != null && !jsonObj.get("{{{baseName}}}").isJsonNull()) && {{/notRequiredOrIsNullable}}!jsonObj.get("{{{baseName}}}").isJsonPrimitive()) {
throw new IllegalArgumentException(String.format("Expected the field `{{{baseName}}}` to be a primitive type in the JSON string but got `%s`", jsonObj.get("{{{baseName}}}").toString())); throw new IllegalArgumentException(String.format(Locale.ROOT, "Expected the field `{{{baseName}}}` to be a primitive type in the JSON string but got `%s`", jsonObj.get("{{{baseName}}}").toString()));
} }
{{/isString}} {{/isString}}
{{#isModel}} {{#isModel}}
@ -486,7 +487,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
break; break;
{{/mappedModels}} {{/mappedModels}}
default: default:
throw new IllegalArgumentException(String.format("The value of the `{{{propertyBaseName}}}` field `%s` does not match any key defined in the discriminator's mapping.", discriminatorValue)); throw new IllegalArgumentException(String.format(Locale.ROOT, "The value of the `{{{propertyBaseName}}}` field `%s` does not match any key defined in the discriminator's mapping.", discriminatorValue));
} }
{{/discriminator}} {{/discriminator}}
{{/hasChildren}} {{/hasChildren}}
@ -553,7 +554,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
else if (entry.getValue().getAsJsonPrimitive().isBoolean()) else if (entry.getValue().getAsJsonPrimitive().isBoolean())
instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean());
else else
throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); throw new IllegalArgumentException(String.format(Locale.ROOT, "The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString()));
} else if (entry.getValue().isJsonArray()) { } else if (entry.getValue().isJsonArray()) {
instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class));
} else { // JSON object } else { // JSON object

4
modules/openapi-generator/src/main/resources/Java/libraries/restclient/ApiClient.mustache vendored
View File

@ -50,6 +50,7 @@ import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.TimeZone; import java.util.TimeZone;
@ -758,6 +759,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
if (serverIndex != null) { if (serverIndex != null) {
if (serverIndex < 0 || serverIndex >= servers.size()) { if (serverIndex < 0 || serverIndex >= servers.size()) {
throw new ArrayIndexOutOfBoundsException(String.format( throw new ArrayIndexOutOfBoundsException(String.format(
Locale.ROOT,
"Invalid index %d when selecting the host settings. Must be less than %d", serverIndex, servers.size() "Invalid index %d when selecting the host settings. Must be less than %d", serverIndex, servers.size()
)); ));
} }
@ -853,7 +855,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
String delimiter = ""; String delimiter = "";
for (final Map.Entry<String, List<String>> entry : cookies.entrySet()) { for (final Map.Entry<String, List<String>> entry : cookies.entrySet()) {
final String value = entry.getValue().get(entry.getValue().size() - 1); final String value = entry.getValue().get(entry.getValue().size() - 1);
cookieValue.append(String.format("%s%s=%s", delimiter, entry.getKey(), value)); cookieValue.append(String.format(Locale.ROOT, "%s%s=%s", delimiter, entry.getKey(), value));
delimiter = "; "; delimiter = "; ";
} }
return cookieValue.toString(); return cookieValue.toString();

1
modules/openapi-generator/src/main/resources/Java/libraries/restclient/model.mustache vendored
View File

@ -18,6 +18,7 @@ import com.fasterxml.jackson.annotation.JsonAnySetter;
{{/models}} {{/models}}
import java.util.Objects; import java.util.Objects;
import java.util.Arrays; import java.util.Arrays;
import java.util.Locale;
{{#imports}} {{#imports}}
import {{import}}; import {{import}};
{{/imports}} {{/imports}}

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

@ -407,8 +407,8 @@ public {{>sealed}}class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#v
int i = 0; int i = 0;
for ({{{items.datatypeWithEnum}}} _item : {{getter}}()) { for ({{{items.datatypeWithEnum}}} _item : {{getter}}()) {
try { try {
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
URLEncoder.encode(String.valueOf(_item), "UTF-8").replaceAll("\\+", "%20"))); URLEncoder.encode(String.valueOf(_item), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
@ -422,8 +422,8 @@ public {{>sealed}}class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#v
if ({{getter}}() != null) { if ({{getter}}() != null) {
for (int i = 0; i < {{getter}}().size(); i++) { for (int i = 0; i < {{getter}}().size(); i++) {
try { try {
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
URLEncoder.encode(String.valueOf({{getter}}().get(i)), "UTF-8").replaceAll("\\+", "%20"))); URLEncoder.encode(String.valueOf({{getter}}().get(i)), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
@ -440,8 +440,8 @@ public {{>sealed}}class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#v
int i = 0; int i = 0;
for ({{{items.dataType}}} _item : {{getter}}()) { for ({{{items.dataType}}} _item : {{getter}}()) {
if (_item != null) { if (_item != null) {
joiner.add(_item.toUrlQueryString(String.format("%s{{baseName}}%s%s", prefix, suffix, joiner.add(_item.toUrlQueryString(String.format(Locale.ROOT, "%s{{baseName}}%s%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix)))); "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix))));
} }
} }
i++; i++;
@ -451,8 +451,8 @@ public {{>sealed}}class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#v
if ({{getter}}() != null) { if ({{getter}}() != null) {
for (int i = 0; i < {{getter}}().size(); i++) { for (int i = 0; i < {{getter}}().size(); i++) {
if ({{getter}}().get(i) != null) { if ({{getter}}().get(i) != null) {
joiner.add({{getter}}().get(i).toUrlQueryString(String.format("%s{{baseName}}%s%s", prefix, suffix, joiner.add({{getter}}().get(i).toUrlQueryString(String.format(Locale.ROOT, "%s{{baseName}}%s%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix)))); "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix))));
} }
} }
} }
@ -465,8 +465,8 @@ public {{>sealed}}class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#v
for ({{{items.dataType}}} _item : {{getter}}()) { for ({{{items.dataType}}} _item : {{getter}}()) {
if (_item != null) { if (_item != null) {
try { try {
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
URLEncoder.encode(String.valueOf(_item), "UTF-8").replaceAll("\\+", "%20"))); URLEncoder.encode(String.valueOf(_item), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
@ -482,8 +482,8 @@ public {{>sealed}}class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#v
for (int i = 0; i < {{getter}}().size(); i++) { for (int i = 0; i < {{getter}}().size(); i++) {
if ({{getter}}().get(i) != null) { if ({{getter}}().get(i) != null) {
try { try {
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
URLEncoder.encode(String.valueOf({{getter}}().get(i)), "UTF-8").replaceAll("\\+", "%20"))); URLEncoder.encode(String.valueOf({{getter}}().get(i)), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
@ -502,8 +502,8 @@ public {{>sealed}}class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#v
if ({{getter}}() != null) { if ({{getter}}() != null) {
for (String _key : {{getter}}().keySet()) { for (String _key : {{getter}}().keySet()) {
try { try {
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, _key, containerSuffix),
{{getter}}().get(_key), URLEncoder.encode(String.valueOf({{getter}}().get(_key)), "UTF-8").replaceAll("\\+", "%20"))); {{getter}}().get(_key), URLEncoder.encode(String.valueOf({{getter}}().get(_key)), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
@ -516,8 +516,8 @@ public {{>sealed}}class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#v
if ({{getter}}() != null) { if ({{getter}}() != null) {
for (String _key : {{getter}}().keySet()) { for (String _key : {{getter}}().keySet()) {
if ({{getter}}().get(_key) != null) { if ({{getter}}().get(_key) != null) {
joiner.add({{getter}}().get(_key).toUrlQueryString(String.format("%s{{baseName}}%s%s", prefix, suffix, joiner.add({{getter}}().get(_key).toUrlQueryString(String.format(Locale.ROOT, "%s{{baseName}}%s%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix)))); "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, _key, containerSuffix))));
} }
} }
} }
@ -527,7 +527,7 @@ public {{>sealed}}class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#v
{{#isPrimitiveType}} {{#isPrimitiveType}}
if ({{getter}}() != null) { if ({{getter}}() != null) {
try { try {
joiner.add(String.format("%s{{{baseName}}}%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf({{{getter}}}()), "UTF-8").replaceAll("\\+", "%20"))); joiner.add(String.format(Locale.ROOT, "%s{{{baseName}}}%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf({{{getter}}}()), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
throw new RuntimeException(e); throw new RuntimeException(e);
@ -543,7 +543,7 @@ public {{>sealed}}class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#v
{{^isModel}} {{^isModel}}
if ({{getter}}() != null) { if ({{getter}}() != null) {
try { try {
joiner.add(String.format("%s{{{baseName}}}%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf({{{getter}}}()), "UTF-8").replaceAll("\\+", "%20"))); joiner.add(String.format(Locale.ROOT, "%s{{{baseName}}}%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf({{{getter}}}()), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
throw new RuntimeException(e); throw new RuntimeException(e);

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

@ -63,6 +63,7 @@ import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.TimeZone; import java.util.TimeZone;
@ -860,7 +861,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
String delimiter = ""; String delimiter = "";
for (final Map.Entry<String, List<String>> entry : cookies.entrySet()) { for (final Map.Entry<String, List<String>> entry : cookies.entrySet()) {
final String value = entry.getValue().get(entry.getValue().size() - 1); final String value = entry.getValue().get(entry.getValue().size() - 1);
cookieValue.append(String.format("%s%s=%s", delimiter, entry.getKey(), value)); cookieValue.append(String.format(Locale.ROOT, "%s%s=%s", delimiter, entry.getKey(), value));
delimiter = "; "; delimiter = "; ";
} }
return cookieValue.toString(); return cookieValue.toString();

1
modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/model.mustache vendored
View File

@ -18,6 +18,7 @@ import com.fasterxml.jackson.annotation.JsonAnySetter;
{{/models}} {{/models}}
import java.util.Objects; import java.util.Objects;
import java.util.Arrays; import java.util.Arrays;
import java.util.Locale;
{{#imports}} {{#imports}}
import {{import}}; import {{import}};
{{/imports}} {{/imports}}

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

@ -407,8 +407,8 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
int i = 0; int i = 0;
for ({{{items.datatypeWithEnum}}} _item : {{getter}}()) { for ({{{items.datatypeWithEnum}}} _item : {{getter}}()) {
try { try {
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
URLEncoder.encode(String.valueOf(_item), "UTF-8").replaceAll("\\+", "%20"))); URLEncoder.encode(String.valueOf(_item), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
@ -422,8 +422,8 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
if ({{getter}}() != null) { if ({{getter}}() != null) {
for (int i = 0; i < {{getter}}().size(); i++) { for (int i = 0; i < {{getter}}().size(); i++) {
try { try {
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
URLEncoder.encode(String.valueOf({{getter}}().get(i)), "UTF-8").replaceAll("\\+", "%20"))); URLEncoder.encode(String.valueOf({{getter}}().get(i)), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
@ -440,8 +440,8 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
int i = 0; int i = 0;
for ({{{items.dataType}}} _item : {{getter}}()) { for ({{{items.dataType}}} _item : {{getter}}()) {
if (_item != null) { if (_item != null) {
joiner.add(_item.toUrlQueryString(String.format("%s{{baseName}}%s%s", prefix, suffix, joiner.add(_item.toUrlQueryString(String.format(Locale.ROOT, "%s{{baseName}}%s%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix)))); "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix))));
} }
} }
i++; i++;
@ -451,8 +451,8 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
if ({{getter}}() != null) { if ({{getter}}() != null) {
for (int i = 0; i < {{getter}}().size(); i++) { for (int i = 0; i < {{getter}}().size(); i++) {
if ({{getter}}().get(i) != null) { if ({{getter}}().get(i) != null) {
joiner.add({{getter}}().get(i).toUrlQueryString(String.format("%s{{baseName}}%s%s", prefix, suffix, joiner.add({{getter}}().get(i).toUrlQueryString(String.format(Locale.ROOT, "%s{{baseName}}%s%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix)))); "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix))));
} }
} }
} }
@ -465,8 +465,8 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
for ({{{items.dataType}}} _item : {{getter}}()) { for ({{{items.dataType}}} _item : {{getter}}()) {
if (_item != null) { if (_item != null) {
try { try {
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
URLEncoder.encode(String.valueOf(_item), "UTF-8").replaceAll("\\+", "%20"))); URLEncoder.encode(String.valueOf(_item), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
@ -482,8 +482,8 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
for (int i = 0; i < {{getter}}().size(); i++) { for (int i = 0; i < {{getter}}().size(); i++) {
if ({{getter}}().get(i) != null) { if ({{getter}}().get(i) != null) {
try { try {
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
URLEncoder.encode(String.valueOf({{getter}}().get(i)), "UTF-8").replaceAll("\\+", "%20"))); URLEncoder.encode(String.valueOf({{getter}}().get(i)), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
@ -502,8 +502,8 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
if ({{getter}}() != null) { if ({{getter}}() != null) {
for (String _key : {{getter}}().keySet()) { for (String _key : {{getter}}().keySet()) {
try { try {
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, _key, containerSuffix),
{{getter}}().get(_key), URLEncoder.encode(String.valueOf({{getter}}().get(_key)), "UTF-8").replaceAll("\\+", "%20"))); {{getter}}().get(_key), URLEncoder.encode(String.valueOf({{getter}}().get(_key)), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
@ -516,8 +516,8 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
if ({{getter}}() != null) { if ({{getter}}() != null) {
for (String _key : {{getter}}().keySet()) { for (String _key : {{getter}}().keySet()) {
if ({{getter}}().get(_key) != null) { if ({{getter}}().get(_key) != null) {
joiner.add({{getter}}().get(_key).toUrlQueryString(String.format("%s{{baseName}}%s%s", prefix, suffix, joiner.add({{getter}}().get(_key).toUrlQueryString(String.format(Locale.ROOT, "%s{{baseName}}%s%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix)))); "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, _key, containerSuffix))));
} }
} }
} }
@ -527,7 +527,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
{{#isPrimitiveType}} {{#isPrimitiveType}}
if ({{getter}}() != null) { if ({{getter}}() != null) {
try { try {
joiner.add(String.format("%s{{{baseName}}}%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf({{{getter}}}()), "UTF-8").replaceAll("\\+", "%20"))); joiner.add(String.format(Locale.ROOT, "%s{{{baseName}}}%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf({{{getter}}}()), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
throw new RuntimeException(e); throw new RuntimeException(e);
@ -543,7 +543,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
{{^isModel}} {{^isModel}}
if ({{getter}}() != null) { if ({{getter}}() != null) {
try { try {
joiner.add(String.format("%s{{{baseName}}}%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf({{{getter}}}()), "UTF-8").replaceAll("\\+", "%20"))); joiner.add(String.format(Locale.ROOT, "%s{{{baseName}}}%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf({{{getter}}}()), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
throw new RuntimeException(e); throw new RuntimeException(e);

3
modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/auth/ApiKeyAuth.mustache vendored
View File

@ -5,6 +5,7 @@ package {{invokerPackage}}.auth;
import java.io.IOException; import java.io.IOException;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.util.Locale;
import okhttp3.Interceptor; import okhttp3.Interceptor;
import okhttp3.Request; import okhttp3.Request;
@ -66,7 +67,7 @@ public class ApiKeyAuth implements Interceptor {
.build(); .build();
} else if ("cookie".equals(location)) { } else if ("cookie".equals(location)) {
request = request.newBuilder() request = request.newBuilder()
.addHeader("Cookie", String.format("%s=%s", paramName, apiKey)) .addHeader("Cookie", String.format(Locale.ROOT, "%s=%s", paramName, apiKey))
.build(); .build();
} }
return chain.proceed(request); return chain.proceed(request);

9
modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play24/Play24CallFactory.mustache vendored
View File

@ -20,6 +20,7 @@ import java.net.URISyntaxException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
@ -62,14 +63,14 @@ public class Play24CallFactory implements okhttp3.Call.Factory {
rb.addHeader(header.getKey(), header.getValue()); rb.addHeader(header.getKey(), header.getValue());
} }
for (Map.Entry<String, String> cookie : this.extraCookies.entrySet()) { for (Map.Entry<String, String> cookie : this.extraCookies.entrySet()) {
rb.addHeader("Cookie", String.format("%s=%s", cookie.getKey(), cookie.getValue())); rb.addHeader("Cookie", String.format(Locale.ROOT, "%s=%s", cookie.getKey(), cookie.getValue()));
} }
// add extra query params // add extra query params
if (!this.extraQueryParams.isEmpty()) { if (!this.extraQueryParams.isEmpty()) {
String newQuery = request.url().uri().getQuery(); String newQuery = request.url().uri().getQuery();
for (Pair queryParam : this.extraQueryParams) { for (Pair queryParam : this.extraQueryParams) {
String param = String.format("%s=%s", queryParam.getName(), queryParam.getValue()); String param = String.format(Locale.ROOT, "%s=%s", queryParam.getName(), queryParam.getValue());
if (newQuery == null) { if (newQuery == null) {
newQuery = param; newQuery = param;
} else { } else {
@ -176,7 +177,7 @@ public class Play24CallFactory implements okhttp3.Call.Factory {
String delimiter = ""; String delimiter = "";
final StringBuilder cookieHeader = new StringBuilder(); final StringBuilder cookieHeader = new StringBuilder();
for (final String cookie : cookies) { for (final String cookie : cookies) {
cookieHeader.append(String.format("%s%s", delimiter, cookie)); cookieHeader.append(String.format(Locale.ROOT, "%s%s", delimiter, cookie));
delimiter = "; "; delimiter = "; ";
} }
wsRequest.setHeader("Cookie", cookieHeader.toString()); wsRequest.setHeader("Cookie", cookieHeader.toString());
@ -221,7 +222,7 @@ public class Play24CallFactory implements okhttp3.Call.Factory {
} }
} }
for (final WSCookie cookie : r.getCookies()) { for (final WSCookie cookie : r.getCookies()) {
builder.addHeader("Cookie", String.format("%s=%s", cookie.getName(), cookie.getValue())); builder.addHeader("Cookie", String.format(Locale.ROOT, "%s=%s", cookie.getName(), cookie.getValue()));
} }
builder.protocol(Protocol.HTTP_1_1); builder.protocol(Protocol.HTTP_1_1);

9
modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play25/Play25CallFactory.mustache vendored
View File

@ -20,6 +20,7 @@ import java.net.URISyntaxException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.concurrent.CompletionStage; import java.util.concurrent.CompletionStage;
@ -71,14 +72,14 @@ public class Play25CallFactory implements okhttp3.Call.Factory {
rb.addHeader(header.getKey(), header.getValue()); rb.addHeader(header.getKey(), header.getValue());
} }
for (Map.Entry<String, String> cookie : this.extraCookies.entrySet()) { for (Map.Entry<String, String> cookie : this.extraCookies.entrySet()) {
rb.addHeader("Cookie", String.format("%s=%s", cookie.getKey(), cookie.getValue())); rb.addHeader("Cookie", String.format(Locale.ROOT, "%s=%s", cookie.getKey(), cookie.getValue()));
} }
// add extra query params // add extra query params
if (!this.extraQueryParams.isEmpty()) { if (!this.extraQueryParams.isEmpty()) {
String newQuery = request.url().uri().getQuery(); String newQuery = request.url().uri().getQuery();
for (Pair queryParam : this.extraQueryParams) { for (Pair queryParam : this.extraQueryParams) {
String param = String.format("%s=%s", queryParam.getName(), queryParam.getValue()); String param = String.format(Locale.ROOT, "%s=%s", queryParam.getName(), queryParam.getValue());
if (newQuery == null) { if (newQuery == null) {
newQuery = param; newQuery = param;
} else { } else {
@ -181,7 +182,7 @@ public class Play25CallFactory implements okhttp3.Call.Factory {
String delimiter = ""; String delimiter = "";
final StringBuilder cookieHeader = new StringBuilder(); final StringBuilder cookieHeader = new StringBuilder();
for (final String cookie : cookies) { for (final String cookie : cookies) {
cookieHeader.append(String.format("%s%s", delimiter, cookie)); cookieHeader.append(String.format(Locale.ROOT, "%s%s", delimiter, cookie));
delimiter = "; "; delimiter = "; ";
} }
wsRequest.setHeader("Cookie", cookieHeader.toString()); wsRequest.setHeader("Cookie", cookieHeader.toString());
@ -230,7 +231,7 @@ public class Play25CallFactory implements okhttp3.Call.Factory {
} }
} }
for (final WSCookie cookie : r.getCookies()) { for (final WSCookie cookie : r.getCookies()) {
builder.addHeader("Cookie", String.format("%s=%s", cookie.getName(), cookie.getValue())); builder.addHeader("Cookie", String.format(Locale.ROOT, "%s=%s", cookie.getName(), cookie.getValue()));
} }

7
modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play26/Play26CallFactory.mustache vendored
View File

@ -21,6 +21,7 @@ import java.net.URISyntaxException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.concurrent.CompletionStage; import java.util.concurrent.CompletionStage;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
@ -80,14 +81,14 @@ public class Play26CallFactory implements okhttp3.Call.Factory {
rb.addHeader(header.getKey(), header.getValue()); rb.addHeader(header.getKey(), header.getValue());
} }
for (Map.Entry<String, String> cookie : this.extraCookies.entrySet()) { for (Map.Entry<String, String> cookie : this.extraCookies.entrySet()) {
rb.addHeader("Cookie", String.format("%s=%s", cookie.getKey(), cookie.getValue())); rb.addHeader("Cookie", String.format(Locale.ROOT, "%s=%s", cookie.getKey(), cookie.getValue()));
} }
// add extra query params // add extra query params
if (!this.extraQueryParams.isEmpty()) { if (!this.extraQueryParams.isEmpty()) {
String newQuery = request.url().uri().getQuery(); String newQuery = request.url().uri().getQuery();
for (Pair queryParam : this.extraQueryParams) { for (Pair queryParam : this.extraQueryParams) {
String param = String.format("%s=%s", queryParam.getName(), queryParam.getValue()); String param = String.format(Locale.ROOT, "%s=%s", queryParam.getName(), queryParam.getValue());
if (newQuery == null) { if (newQuery == null) {
newQuery = param; newQuery = param;
} else { } else {
@ -260,7 +261,7 @@ public class Play26CallFactory implements okhttp3.Call.Factory {
} }
} }
for (final WSCookie cookie : r.getCookies()) { for (final WSCookie cookie : r.getCookies()) {
builder.addHeader("Cookie", String.format("%s=%s", cookie.getName(), cookie.getValue())); builder.addHeader("Cookie", String.format(Locale.ROOT, "%s=%s", cookie.getName(), cookie.getValue()));
} }
builder.message(r.getStatusText()); builder.message(r.getStatusText());

2
modules/openapi-generator/src/main/resources/Java/libraries/vertx/ApiClient.mustache vendored
View File

@ -529,7 +529,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
String delimiter = ""; String delimiter = "";
for (final Map.Entry<String, String> entry : cookies.entries()) { for (final Map.Entry<String, String> entry : cookies.entries()) {
if (entry.getValue() != null) { if (entry.getValue() != null) {
cookieValue.append(String.format("%s%s=%s", delimiter, entry.getKey(), entry.getValue())); cookieValue.append(String.format(Locale.ROOT, "%s%s=%s", delimiter, entry.getKey(), entry.getValue()));
delimiter = "; "; delimiter = "; ";
} }
} }

1
modules/openapi-generator/src/main/resources/Java/libraries/webclient/model.mustache vendored
View File

@ -18,6 +18,7 @@ import com.fasterxml.jackson.annotation.JsonAnySetter;
{{/models}} {{/models}}
import java.util.Objects; import java.util.Objects;
import java.util.Arrays; import java.util.Arrays;
import java.util.Locale;
{{#imports}} {{#imports}}
import {{import}}; import {{import}};
{{/imports}} {{/imports}}

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

@ -407,8 +407,8 @@ public {{>sealed}}class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#v
int i = 0; int i = 0;
for ({{{items.datatypeWithEnum}}} _item : {{getter}}()) { for ({{{items.datatypeWithEnum}}} _item : {{getter}}()) {
try { try {
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
URLEncoder.encode(String.valueOf(_item), "UTF-8").replaceAll("\\+", "%20"))); URLEncoder.encode(String.valueOf(_item), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
@ -422,8 +422,8 @@ public {{>sealed}}class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#v
if ({{getter}}() != null) { if ({{getter}}() != null) {
for (int i = 0; i < {{getter}}().size(); i++) { for (int i = 0; i < {{getter}}().size(); i++) {
try { try {
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
URLEncoder.encode(String.valueOf({{getter}}().get(i)), "UTF-8").replaceAll("\\+", "%20"))); URLEncoder.encode(String.valueOf({{getter}}().get(i)), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
@ -440,8 +440,8 @@ public {{>sealed}}class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#v
int i = 0; int i = 0;
for ({{{items.dataType}}} _item : {{getter}}()) { for ({{{items.dataType}}} _item : {{getter}}()) {
if (_item != null) { if (_item != null) {
joiner.add(_item.toUrlQueryString(String.format("%s{{baseName}}%s%s", prefix, suffix, joiner.add(_item.toUrlQueryString(String.format(Locale.ROOT, "%s{{baseName}}%s%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix)))); "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix))));
} }
} }
i++; i++;
@ -451,8 +451,8 @@ public {{>sealed}}class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#v
if ({{getter}}() != null) { if ({{getter}}() != null) {
for (int i = 0; i < {{getter}}().size(); i++) { for (int i = 0; i < {{getter}}().size(); i++) {
if ({{getter}}().get(i) != null) { if ({{getter}}().get(i) != null) {
joiner.add({{getter}}().get(i).toUrlQueryString(String.format("%s{{baseName}}%s%s", prefix, suffix, joiner.add({{getter}}().get(i).toUrlQueryString(String.format(Locale.ROOT, "%s{{baseName}}%s%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix)))); "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix))));
} }
} }
} }
@ -465,8 +465,8 @@ public {{>sealed}}class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#v
for ({{{items.dataType}}} _item : {{getter}}()) { for ({{{items.dataType}}} _item : {{getter}}()) {
if (_item != null) { if (_item != null) {
try { try {
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
URLEncoder.encode(String.valueOf(_item), "UTF-8").replaceAll("\\+", "%20"))); URLEncoder.encode(String.valueOf(_item), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
@ -482,8 +482,8 @@ public {{>sealed}}class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#v
for (int i = 0; i < {{getter}}().size(); i++) { for (int i = 0; i < {{getter}}().size(); i++) {
if ({{getter}}().get(i) != null) { if ({{getter}}().get(i) != null) {
try { try {
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
URLEncoder.encode(String.valueOf({{getter}}().get(i)), "UTF-8").replaceAll("\\+", "%20"))); URLEncoder.encode(String.valueOf({{getter}}().get(i)), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
@ -502,8 +502,8 @@ public {{>sealed}}class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#v
if ({{getter}}() != null) { if ({{getter}}() != null) {
for (String _key : {{getter}}().keySet()) { for (String _key : {{getter}}().keySet()) {
try { try {
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, _key, containerSuffix),
{{getter}}().get(_key), URLEncoder.encode(String.valueOf({{getter}}().get(_key)), "UTF-8").replaceAll("\\+", "%20"))); {{getter}}().get(_key), URLEncoder.encode(String.valueOf({{getter}}().get(_key)), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
@ -516,8 +516,8 @@ public {{>sealed}}class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#v
if ({{getter}}() != null) { if ({{getter}}() != null) {
for (String _key : {{getter}}().keySet()) { for (String _key : {{getter}}().keySet()) {
if ({{getter}}().get(_key) != null) { if ({{getter}}().get(_key) != null) {
joiner.add({{getter}}().get(_key).toUrlQueryString(String.format("%s{{baseName}}%s%s", prefix, suffix, joiner.add({{getter}}().get(_key).toUrlQueryString(String.format(Locale.ROOT, "%s{{baseName}}%s%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix)))); "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, _key, containerSuffix))));
} }
} }
} }
@ -527,7 +527,7 @@ public {{>sealed}}class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#v
{{#isPrimitiveType}} {{#isPrimitiveType}}
if ({{getter}}() != null) { if ({{getter}}() != null) {
try { try {
joiner.add(String.format("%s{{{baseName}}}%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf({{{getter}}}()), "UTF-8").replaceAll("\\+", "%20"))); joiner.add(String.format(Locale.ROOT, "%s{{{baseName}}}%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf({{{getter}}}()), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
throw new RuntimeException(e); throw new RuntimeException(e);
@ -543,7 +543,7 @@ public {{>sealed}}class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#v
{{^isModel}} {{^isModel}}
if ({{getter}}() != null) { if ({{getter}}() != null) {
try { try {
joiner.add(String.format("%s{{{baseName}}}%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf({{{getter}}}()), "UTF-8").replaceAll("\\+", "%20"))); joiner.add(String.format(Locale.ROOT, "%s{{{baseName}}}%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf({{{getter}}}()), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
throw new RuntimeException(e); throw new RuntimeException(e);

1
modules/openapi-generator/src/main/resources/Java/model.mustache vendored
View File

@ -8,6 +8,7 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
{{/useReflectionEqualsHashCode}} {{/useReflectionEqualsHashCode}}
import java.util.Objects; import java.util.Objects;
import java.util.Arrays; import java.util.Arrays;
import java.util.Locale;
{{#imports}} {{#imports}}
import {{import}}; import {{import}};
{{/imports}} {{/imports}}

3
modules/openapi-generator/src/main/resources/Java/modelEnum.mustache vendored
View File

@ -12,6 +12,7 @@ import com.google.gson.stream.JsonWriter;
{{#isUri}} {{#isUri}}
import java.net.URI; import java.net.URI;
{{/isUri}} {{/isUri}}
import java.util.Locale;
/** /**
* {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}} * {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}}
@ -114,7 +115,7 @@ import java.net.URI;
prefix = ""; prefix = "";
} }
return String.format("%s=%s", prefix, this.toString()); return String.format(Locale.ROOT, "%s=%s", prefix, this.toString());
} }
{{/supportUrlQuery}} {{/supportUrlQuery}}
} }

36
modules/openapi-generator/src/main/resources/Java/pojo.mustache vendored
View File

@ -406,8 +406,8 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
int i = 0; int i = 0;
for ({{{items.datatypeWithEnum}}} _item : {{getter}}()) { for ({{{items.datatypeWithEnum}}} _item : {{getter}}()) {
try { try {
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
URLEncoder.encode(String.valueOf(_item), "UTF-8").replaceAll("\\+", "%20"))); URLEncoder.encode(String.valueOf(_item), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
@ -421,8 +421,8 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
if ({{getter}}() != null) { if ({{getter}}() != null) {
for (int i = 0; i < {{getter}}().size(); i++) { for (int i = 0; i < {{getter}}().size(); i++) {
try { try {
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
URLEncoder.encode(String.valueOf({{getter}}().get(i)), "UTF-8").replaceAll("\\+", "%20"))); URLEncoder.encode(String.valueOf({{getter}}().get(i)), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
@ -439,8 +439,8 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
int i = 0; int i = 0;
for ({{{items.dataType}}} _item : {{getter}}()) { for ({{{items.dataType}}} _item : {{getter}}()) {
if (_item != null) { if (_item != null) {
joiner.add(_item.toUrlQueryString(String.format("%s{{baseName}}%s%s", prefix, suffix, joiner.add(_item.toUrlQueryString(String.format(Locale.ROOT, "%s{{baseName}}%s%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix)))); "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix))));
} }
} }
i++; i++;
@ -450,8 +450,8 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
if ({{getter}}() != null) { if ({{getter}}() != null) {
for (int i = 0; i < {{getter}}().size(); i++) { for (int i = 0; i < {{getter}}().size(); i++) {
if ({{getter}}().get(i) != null) { if ({{getter}}().get(i) != null) {
joiner.add({{getter}}().get(i).toUrlQueryString(String.format("%s{{baseName}}%s%s", prefix, suffix, joiner.add({{getter}}().get(i).toUrlQueryString(String.format(Locale.ROOT, "%s{{baseName}}%s%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix)))); "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix))));
} }
} }
} }
@ -464,8 +464,8 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
for ({{{items.dataType}}} _item : {{getter}}()) { for ({{{items.dataType}}} _item : {{getter}}()) {
if (_item != null) { if (_item != null) {
try { try {
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
URLEncoder.encode(String.valueOf(_item), "UTF-8").replaceAll("\\+", "%20"))); URLEncoder.encode(String.valueOf(_item), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
@ -481,8 +481,8 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
for (int i = 0; i < {{getter}}().size(); i++) { for (int i = 0; i < {{getter}}().size(); i++) {
if ({{getter}}().get(i) != null) { if ({{getter}}().get(i) != null) {
try { try {
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
URLEncoder.encode(String.valueOf({{getter}}().get(i)), "UTF-8").replaceAll("\\+", "%20"))); URLEncoder.encode(String.valueOf({{getter}}().get(i)), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
@ -501,8 +501,8 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
if ({{getter}}() != null) { if ({{getter}}() != null) {
for (String _key : {{getter}}().keySet()) { for (String _key : {{getter}}().keySet()) {
try { try {
joiner.add(String.format("%s{{baseName}}%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, _key, containerSuffix),
{{getter}}().get(_key), URLEncoder.encode(String.valueOf({{getter}}().get(_key)), "UTF-8").replaceAll("\\+", "%20"))); {{getter}}().get(_key), URLEncoder.encode(String.valueOf({{getter}}().get(_key)), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
@ -515,8 +515,8 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
if ({{getter}}() != null) { if ({{getter}}() != null) {
for (String _key : {{getter}}().keySet()) { for (String _key : {{getter}}().keySet()) {
if ({{getter}}().get(_key) != null) { if ({{getter}}().get(_key) != null) {
joiner.add({{getter}}().get(_key).toUrlQueryString(String.format("%s{{baseName}}%s%s", prefix, suffix, joiner.add({{getter}}().get(_key).toUrlQueryString(String.format(Locale.ROOT, "%s{{baseName}}%s%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix)))); "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, _key, containerSuffix))));
} }
} }
} }
@ -526,7 +526,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
{{#isPrimitiveType}} {{#isPrimitiveType}}
if ({{getter}}() != null) { if ({{getter}}() != null) {
try { try {
joiner.add(String.format("%s{{{baseName}}}%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf({{{getter}}}()), "UTF-8").replaceAll("\\+", "%20"))); joiner.add(String.format(Locale.ROOT, "%s{{{baseName}}}%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf({{{getter}}}()), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
throw new RuntimeException(e); throw new RuntimeException(e);
@ -542,7 +542,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
{{^isModel}} {{^isModel}}
if ({{getter}}() != null) { if ({{getter}}() != null) {
try { try {
joiner.add(String.format("%s{{{baseName}}}%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf({{{getter}}}()), "UTF-8").replaceAll("\\+", "%20"))); joiner.add(String.format(Locale.ROOT, "%s{{{baseName}}}%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf({{{getter}}}()), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
throw new RuntimeException(e); throw new RuntimeException(e);

2
modules/openapi-generator/src/main/resources/JavaPlayFramework/openapiUtils.mustache vendored
View File

@ -34,7 +34,7 @@ public class OpenAPIUtils {
if (constraintViolations.size() > 0) { if (constraintViolations.size() > 0) {
StringBuilder errors = new StringBuilder(); StringBuilder errors = new StringBuilder();
for (ConstraintViolation<T> constraints : constraintViolations) { for (ConstraintViolation<T> constraints : constraintViolations) {
errors.append(String.format("%s.%s %s\n", errors.append(String.format(Locale.ROOT, "%s.%s %s\n",
constraints.getRootBeanClass().getSimpleName(), constraints.getRootBeanClass().getSimpleName(),
constraints.getPropertyPath(), constraints.getPropertyPath(),
constraints.getMessage())); constraints.getMessage()));

3
modules/openapi-generator/src/main/resources/JavaPlayFramework/securityApiUtils.mustache vendored
View File

@ -29,6 +29,7 @@ import java.security.interfaces.RSAPublicKey;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Optional; import java.util.Optional;
@Singleton @Singleton
@ -131,7 +132,7 @@ public class SecurityAPIUtils {
final PublicKey publicKey = jwk.getPublicKey(); final PublicKey publicKey = jwk.getPublicKey();
if (!(publicKey instanceof RSAPublicKey)) { if (!(publicKey instanceof RSAPublicKey)) {
throw new IllegalArgumentException(String.format("Key with ID %s was found in JWKS but is not a RSA-key.", keyId)); throw new IllegalArgumentException(String.format(Locale.ROOT, "Key with ID %s was found in JWKS but is not a RSA-key.", keyId));
} }
Algorithm algorithm = Algorithm.RSA256((RSAPublicKey) publicKey, null); Algorithm algorithm = Algorithm.RSA256((RSAPublicKey) publicKey, null);

4
modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/clientConfiguration.mustache vendored
View File

@ -33,7 +33,7 @@ import feign.RequestTemplate;
{{/hasOAuthMethods}} {{/hasOAuthMethods}}
{{/hasAuthMethods}} {{/hasAuthMethods}}
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import java.util.Locale;
public class ClientConfiguration { public class ClientConfiguration {
@ -108,7 +108,7 @@ public class ClientConfiguration {
public String getBearerToken() { public String getBearerToken() {
final OAuth2AccessToken accessToken = getAccessToken(); final OAuth2AccessToken accessToken = getAccessToken();
return String.format( "%s %s", accessToken.getTokenType().getValue(), accessToken.getTokenValue() ); return String.format( Locale.ROOT, "%s %s", accessToken.getTokenType().getValue(), accessToken.getTokenValue() );
} }
} }
{{/hasOAuthMethods}} {{/hasOAuthMethods}}

35
modules/openapi-generator/src/main/resources/java-helidon/server/libraries/se/validatorUtils.mustache vendored
View File

@ -7,6 +7,7 @@ import java.util.Collection;
import java.util.List; import java.util.List;
{{/x-helidon-v3}} {{/x-helidon-v3}}
import java.util.Map; import java.util.Map;
import java.util.Locale;
import java.util.Objects; import java.util.Objects;
{{^x-helidon-v3}} {{^x-helidon-v3}}
import java.util.Optional; import java.util.Optional;
@ -27,7 +28,7 @@ public final class ValidatorUtils {
public static boolean validateMin(Integer value, Integer min) { public static boolean validateMin(Integer value, Integer min) {
checkNonNull(value); checkNonNull(value);
if (value < min) { if (value < min) {
throw new ValidationException(String.format("%s is less than %s", value, min)); throw new ValidationException(String.format(Locale.ROOT, "%s is less than %s", value, min));
} }
return true; return true;
} }
@ -35,7 +36,7 @@ public final class ValidatorUtils {
public static boolean validateMax(Integer value, Integer max) { public static boolean validateMax(Integer value, Integer max) {
checkNonNull(value); checkNonNull(value);
if (value > max) { if (value > max) {
throw new ValidationException(String.format("%s is more than %s", value, max)); throw new ValidationException(String.format(Locale.ROOT, "%s is more than %s", value, max));
} }
return true; return true;
} }
@ -72,7 +73,7 @@ public final class ValidatorUtils {
if (value.matches(pattern)) { if (value.matches(pattern)) {
return true; return true;
} }
throw new ValidationException(String.format("'%s' does not match the pattern '%s'", value, pattern)); throw new ValidationException(String.format(Locale.ROOT, "'%s' does not match the pattern '%s'", value, pattern));
} }
public static boolean validateMin(BigDecimal value, String stringMinValue, boolean inclusive) { public static boolean validateMin(BigDecimal value, String stringMinValue, boolean inclusive) {
@ -89,7 +90,7 @@ public final class ValidatorUtils {
} }
} }
throw new ValidationException( throw new ValidationException(
String.format("%s is not valid value. Min value '%s'. Inclusive - %s.", value, stringMinValue, inclusive) String.format(Locale.ROOT, "%s is not valid value. Min value '%s'. Inclusive - %s.", value, stringMinValue, inclusive)
); );
} }
@ -107,7 +108,7 @@ public final class ValidatorUtils {
} }
} }
throw new ValidationException( throw new ValidationException(
String.format("%s is not valid value. Max value '%s'. Inclusive - %s.", value, stringMaxValue, inclusive) String.format(Locale.ROOT, "%s is not valid value. Max value '%s'. Inclusive - %s.", value, stringMaxValue, inclusive)
); );
} }
@ -168,7 +169,7 @@ public final class ValidatorUtils {
<T> T check(String paramName, T paramValue, List<T> validValues) { <T> T check(String paramName, T paramValue, List<T> validValues) {
if (!validValues.contains(paramValue)) { if (!validValues.contains(paramValue)) {
errorsCollector.fatal(String.format("Invalid value %s = '%s' not among %s", errorsCollector.fatal(String.format(Locale.ROOT, "Invalid value %s = '%s' not among %s",
paramName, paramName,
paramValue, paramValue,
validValues)); validValues));
@ -178,21 +179,21 @@ public final class ValidatorUtils {
<T> T require(String paramName, T paramValue) { <T> T require(String paramName, T paramValue) {
if (paramValue == null || ((paramValue instanceof Optional opt) && opt.isEmpty())) { if (paramValue == null || ((paramValue instanceof Optional opt) && opt.isEmpty())) {
errorsCollector.fatal(String.format("Missing required param: %s", paramName)); errorsCollector.fatal(String.format(Locale.ROOT, "Missing required param: %s", paramName));
} }
return paramValue; return paramValue;
} }
<T> List<T> require(String paramName, List<T> paramValues) { <T> List<T> require(String paramName, List<T> paramValues) {
if (paramValues.isEmpty()) { if (paramValues.isEmpty()) {
errorsCollector.fatal(String.format("Empty required parameter: %s", paramName)); errorsCollector.fatal(String.format(Locale.ROOT, "Empty required parameter: %s", paramName));
} }
return paramValues; return paramValues;
} }
<T> T require(String paramName, Optional<T> optionalValue) { <T> T require(String paramName, Optional<T> optionalValue) {
if (optionalValue.isEmpty()) { if (optionalValue.isEmpty()) {
errorsCollector.fatal(String.format("Empty required parameter: %s", paramName)); errorsCollector.fatal(String.format(Locale.ROOT, "Empty required parameter: %s", paramName));
} }
return optionalValue.orElse(null); return optionalValue.orElse(null);
} }
@ -200,7 +201,7 @@ public final class ValidatorUtils {
boolean validateMin(String paramName, Long value, Long min, boolean isExclusive) { boolean validateMin(String paramName, Long value, Long min, boolean isExclusive) {
boolean result = value == null || value > min || !isExclusive && value.equals(min); boolean result = value == null || value > min || !isExclusive && value.equals(min);
if (!result) { if (!result) {
errorsCollector.fatal(String.format("Parameter %s %d violates %sminimum %d", errorsCollector.fatal(String.format(Locale.ROOT, "Parameter %s %d violates %sminimum %d",
paramName, paramName,
value, value,
isExclusive ? "exclusive " : "", isExclusive ? "exclusive " : "",
@ -248,7 +249,7 @@ public final class ValidatorUtils {
boolean validateMin(String paramName, Float value, Float min, boolean isExclusive) { boolean validateMin(String paramName, Float value, Float min, boolean isExclusive) {
boolean result = value == null || value.compareTo(min) > 0 || isExclusive && value.equals(min); boolean result = value == null || value.compareTo(min) > 0 || isExclusive && value.equals(min);
if (!result) { if (!result) {
errorsCollector.fatal(String.format("Parameter %s %f violates %sminimum %f", errorsCollector.fatal(String.format(Locale.ROOT, "Parameter %s %f violates %sminimum %f",
paramName, paramName,
value, value,
isExclusive ? "exclusive " : "", isExclusive ? "exclusive " : "",
@ -268,7 +269,7 @@ public final class ValidatorUtils {
boolean validateMin(String paramName, BigDecimal value, BigDecimal min, boolean isExclusive) { boolean validateMin(String paramName, BigDecimal value, BigDecimal min, boolean isExclusive) {
boolean result = value == null || value.compareTo(min) > 0 || !isExclusive && value.equals(min); boolean result = value == null || value.compareTo(min) > 0 || !isExclusive && value.equals(min);
if (!result) { if (!result) {
errorsCollector.fatal(String.format("Parameter %s %f violates %sminimum %f", errorsCollector.fatal(String.format(Locale.ROOT, "Parameter %s %f violates %sminimum %f",
paramName, paramName,
value, value,
isExclusive ? "exclusive " : "", isExclusive ? "exclusive " : "",
@ -284,7 +285,7 @@ public final class ValidatorUtils {
boolean validateMax(String paramName, Long value, Long max, boolean isExclusive) { boolean validateMax(String paramName, Long value, Long max, boolean isExclusive) {
boolean result = value == null || value < max || !isExclusive && value.equals(max); boolean result = value == null || value < max || !isExclusive && value.equals(max);
if (!result) { if (!result) {
errorsCollector.fatal(String.format("Parameter %s %d violates %smaximum %d", errorsCollector.fatal(String.format(Locale.ROOT, "Parameter %s %d violates %smaximum %d",
paramName, paramName,
value, value,
isExclusive ? "exclusive " : "", isExclusive ? "exclusive " : "",
@ -332,7 +333,7 @@ public final class ValidatorUtils {
boolean validateMax(String paramName, Float value, Float max, boolean isExclusive) { boolean validateMax(String paramName, Float value, Float max, boolean isExclusive) {
boolean result = value == null || value.compareTo(max) < 0 || isExclusive && value.equals(max); boolean result = value == null || value.compareTo(max) < 0 || isExclusive && value.equals(max);
if (!result) { if (!result) {
errorsCollector.fatal(String.format("Parameter %s %f violates %smaximum %f", errorsCollector.fatal(String.format(Locale.ROOT, "Parameter %s %f violates %smaximum %f",
paramName, paramName,
value, value,
isExclusive ? "exclusive " : "", isExclusive ? "exclusive " : "",
@ -352,7 +353,7 @@ public final class ValidatorUtils {
boolean validateMax(String paramName, BigDecimal value, BigDecimal max, boolean isExclusive) { boolean validateMax(String paramName, BigDecimal value, BigDecimal max, boolean isExclusive) {
boolean result = value == null || value.compareTo(max) < 0 || !isExclusive && value.equals(max); boolean result = value == null || value.compareTo(max) < 0 || !isExclusive && value.equals(max);
if (!result) { if (!result) {
errorsCollector.fatal(String.format("Parameter %s %f violates %smaximum %f", errorsCollector.fatal(String.format(Locale.ROOT, "Parameter %s %f violates %smaximum %f",
paramName, paramName,
value, value,
isExclusive ? "exclusive " : "", isExclusive ? "exclusive " : "",
@ -368,7 +369,7 @@ public final class ValidatorUtils {
boolean validatePattern(String paramName, String value, String pattern) { boolean validatePattern(String paramName, String value, String pattern) {
boolean result = value == null || value.matches(pattern); boolean result = value == null || value.matches(pattern);
if (!result) { if (!result) {
errorsCollector.fatal(String.format("Parameter %s '%s' does not match pattern '%s'", errorsCollector.fatal(String.format(Locale.ROOT, "Parameter %s '%s' does not match pattern '%s'",
paramName, paramName,
value, value,
pattern)); pattern));
@ -391,7 +392,7 @@ public final class ValidatorUtils {
default -> value.getClass().isArray() ? Array.getLength(value) : -1; default -> value.getClass().isArray() ? Array.getLength(value) : -1;
}; };
if (size == -1) { if (size == -1) {
errorsCollector.fatal(String.format("Parameter %s with type %s unrecognized for validating size", errorsCollector.fatal(String.format(Locale.ROOT, "Parameter %s with type %s unrecognized for validating size",
paramName, paramName,
value.getClass().getName())); value.getClass().getName()));
return false; return false;

1
modules/openapi-generator/src/main/resources/java-micronaut/common/model/model.mustache vendored
View File

@ -7,6 +7,7 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
{{/useReflectionEqualsHashCode}} {{/useReflectionEqualsHashCode}}
import java.util.Objects; import java.util.Objects;
import java.util.Arrays; import java.util.Arrays;
import java.util.Locale;
{{#useOptional}} {{#useOptional}}
import java.util.Optional; import java.util.Optional;
{{/useOptional}} {{/useOptional}}

1
modules/openapi-generator/src/main/resources/kotlin-spring/model.mustache vendored
View File

@ -1,5 +1,6 @@
package {{package}} package {{package}}
import java.util.Locale
import java.util.Objects import java.util.Objects
{{#imports}}import {{import}} {{#imports}}import {{import}}
{{/imports}} {{/imports}}

2
modules/openapi-generator/src/test/resources/2_0/templates/Java/ApiClient.mustache vendored
View File

@ -52,6 +52,7 @@ import java.util.Arrays;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.TimeZone; import java.util.TimeZone;
import java.util.Locale;
import java.net.URLEncoder; import java.net.URLEncoder;
@ -711,6 +712,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
if (serverIndex != null) { if (serverIndex != null) {
if (serverIndex < 0 || serverIndex >= servers.size()) { if (serverIndex < 0 || serverIndex >= servers.size()) {
throw new ArrayIndexOutOfBoundsException(String.format( throw new ArrayIndexOutOfBoundsException(String.format(
Locale.ROOT,
"Invalid index %d when selecting the host settings. Must be less than %d", serverIndex, servers.size() "Invalid index %d when selecting the host settings. Must be less than %d", serverIndex, servers.size()
)); ));
} }

2
modules/openapi-generator/src/test/resources/2_0/templates/Java/libraries/jersey2/ApiClient.mustache vendored
View File

@ -50,6 +50,7 @@ import java.util.List;
import java.util.Arrays; import java.util.Arrays;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.Locale;
{{#jsr310}} {{#jsr310}}
{{#threetenbp}} {{#threetenbp}}
import org.threeten.bp.OffsetDateTime; import org.threeten.bp.OffsetDateTime;
@ -1086,6 +1087,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
if (index < 0 || index >= serverConfigurations.size()) { if (index < 0 || index >= serverConfigurations.size()) {
throw new ArrayIndexOutOfBoundsException( throw new ArrayIndexOutOfBoundsException(
String.format( String.format(
Locale.ROOT,
"Invalid index %d when selecting the host settings. Must be less than %d", "Invalid index %d when selecting the host settings. Must be less than %d",
index, serverConfigurations.size())); index, serverConfigurations.size()));
} }

1
modules/openapi-generator/src/test/resources/2_0/templates/Java/model.mustache vendored
View File

@ -8,6 +8,7 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
{{/useReflectionEqualsHashCode}} {{/useReflectionEqualsHashCode}}
import java.util.Objects; import java.util.Objects;
import java.util.Arrays; import java.util.Arrays;
import java.util.Locale;
{{#imports}} {{#imports}}
import {{import}}; import {{import}};
{{/imports}} {{/imports}}

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

@ -56,6 +56,7 @@ import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.function.Supplier; import java.util.function.Supplier;
import java.util.TimeZone; import java.util.TimeZone;
import java.util.Locale;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -846,6 +847,7 @@ public class ApiClient extends JavaTimeFormatter {
if (serverIndex != null) { if (serverIndex != null) {
if (serverIndex < 0 || serverIndex >= servers.size()) { if (serverIndex < 0 || serverIndex >= servers.size()) {
throw new ArrayIndexOutOfBoundsException(String.format( throw new ArrayIndexOutOfBoundsException(String.format(
Locale.ROOT,
"Invalid index %d when selecting the host settings. Must be less than %d", serverIndex, servers.size() "Invalid index %d when selecting the host settings. Must be less than %d", serverIndex, servers.size()
)); ));
} }

1
samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/api/AuthApi.java
View File

@ -26,6 +26,7 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.StringJoiner; import java.util.StringJoiner;

1
samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/api/BodyApi.java
View File

@ -30,6 +30,7 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.StringJoiner; import java.util.StringJoiner;

1
samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/api/FormApi.java
View File

@ -27,6 +27,7 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.StringJoiner; import java.util.StringJoiner;

1
samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/api/HeaderApi.java
View File

@ -27,6 +27,7 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.StringJoiner; import java.util.StringJoiner;

1
samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/api/PathApi.java
View File

@ -27,6 +27,7 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.StringJoiner; import java.util.StringJoiner;

1
samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/api/QueryApi.java
View File

@ -33,6 +33,7 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.StringJoiner; import java.util.StringJoiner;

5
samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Bird.java
View File

@ -15,6 +15,7 @@ package org.openapitools.client.model;
import java.util.Objects; import java.util.Objects;
import java.util.Arrays; import java.util.Arrays;
import java.util.Locale;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
@ -170,7 +171,7 @@ public class Bird {
// add `size` to the URL query string // add `size` to the URL query string
if (getSize() != null) { if (getSize() != null) {
try { try {
joiner.add(String.format("%ssize%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getSize()), "UTF-8").replaceAll("\\+", "%20"))); joiner.add(String.format(Locale.ROOT, "%ssize%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getSize()), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
throw new RuntimeException(e); throw new RuntimeException(e);
@ -180,7 +181,7 @@ public class Bird {
// add `color` to the URL query string // add `color` to the URL query string
if (getColor() != null) { if (getColor() != null) {
try { try {
joiner.add(String.format("%scolor%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getColor()), "UTF-8").replaceAll("\\+", "%20"))); joiner.add(String.format(Locale.ROOT, "%scolor%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getColor()), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
throw new RuntimeException(e); throw new RuntimeException(e);

5
samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Category.java
View File

@ -15,6 +15,7 @@ package org.openapitools.client.model;
import java.util.Objects; import java.util.Objects;
import java.util.Arrays; import java.util.Arrays;
import java.util.Locale;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
@ -170,7 +171,7 @@ public class Category {
// add `id` to the URL query string // add `id` to the URL query string
if (getId() != null) { if (getId() != null) {
try { try {
joiner.add(String.format("%sid%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getId()), "UTF-8").replaceAll("\\+", "%20"))); joiner.add(String.format(Locale.ROOT, "%sid%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getId()), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
throw new RuntimeException(e); throw new RuntimeException(e);
@ -180,7 +181,7 @@ public class Category {
// add `name` to the URL query string // add `name` to the URL query string
if (getName() != null) { if (getName() != null) {
try { try {
joiner.add(String.format("%sname%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getName()), "UTF-8").replaceAll("\\+", "%20"))); joiner.add(String.format(Locale.ROOT, "%sname%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getName()), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
throw new RuntimeException(e); throw new RuntimeException(e);

13
samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/DataQuery.java
View File

@ -15,6 +15,7 @@ package org.openapitools.client.model;
import java.util.Objects; import java.util.Objects;
import java.util.Arrays; import java.util.Arrays;
import java.util.Locale;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
@ -222,7 +223,7 @@ public class DataQuery extends Query {
// add `id` to the URL query string // add `id` to the URL query string
if (getId() != null) { if (getId() != null) {
try { try {
joiner.add(String.format("%sid%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getId()), "UTF-8").replaceAll("\\+", "%20"))); joiner.add(String.format(Locale.ROOT, "%sid%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getId()), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
throw new RuntimeException(e); throw new RuntimeException(e);
@ -233,8 +234,8 @@ public class DataQuery extends Query {
if (getOutcomes() != null) { if (getOutcomes() != null) {
for (int i = 0; i < getOutcomes().size(); i++) { for (int i = 0; i < getOutcomes().size(); i++) {
try { try {
joiner.add(String.format("%soutcomes%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%soutcomes%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
URLEncoder.encode(String.valueOf(getOutcomes().get(i)), "UTF-8").replaceAll("\\+", "%20"))); URLEncoder.encode(String.valueOf(getOutcomes().get(i)), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
@ -246,7 +247,7 @@ public class DataQuery extends Query {
// add `suffix` to the URL query string // add `suffix` to the URL query string
if (getSuffix() != null) { if (getSuffix() != null) {
try { try {
joiner.add(String.format("%ssuffix%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getSuffix()), "UTF-8").replaceAll("\\+", "%20"))); joiner.add(String.format(Locale.ROOT, "%ssuffix%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getSuffix()), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
throw new RuntimeException(e); throw new RuntimeException(e);
@ -256,7 +257,7 @@ public class DataQuery extends Query {
// add `text` to the URL query string // add `text` to the URL query string
if (getText() != null) { if (getText() != null) {
try { try {
joiner.add(String.format("%stext%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getText()), "UTF-8").replaceAll("\\+", "%20"))); joiner.add(String.format(Locale.ROOT, "%stext%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getText()), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
throw new RuntimeException(e); throw new RuntimeException(e);
@ -266,7 +267,7 @@ public class DataQuery extends Query {
// add `date` to the URL query string // add `date` to the URL query string
if (getDate() != null) { if (getDate() != null) {
try { try {
joiner.add(String.format("%sdate%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getDate()), "UTF-8").replaceAll("\\+", "%20"))); joiner.add(String.format(Locale.ROOT, "%sdate%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getDate()), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
throw new RuntimeException(e); throw new RuntimeException(e);

31
samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/DefaultValue.java
View File

@ -15,6 +15,7 @@ package org.openapitools.client.model;
import java.util.Objects; import java.util.Objects;
import java.util.Arrays; import java.util.Arrays;
import java.util.Locale;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
@ -508,8 +509,8 @@ public class DefaultValue {
for (int i = 0; i < getArrayStringEnumRefDefault().size(); i++) { for (int i = 0; i < getArrayStringEnumRefDefault().size(); i++) {
if (getArrayStringEnumRefDefault().get(i) != null) { if (getArrayStringEnumRefDefault().get(i) != null) {
try { try {
joiner.add(String.format("%sarray_string_enum_ref_default%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%sarray_string_enum_ref_default%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
URLEncoder.encode(String.valueOf(getArrayStringEnumRefDefault().get(i)), "UTF-8").replaceAll("\\+", "%20"))); URLEncoder.encode(String.valueOf(getArrayStringEnumRefDefault().get(i)), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
@ -523,8 +524,8 @@ public class DefaultValue {
if (getArrayStringEnumDefault() != null) { if (getArrayStringEnumDefault() != null) {
for (int i = 0; i < getArrayStringEnumDefault().size(); i++) { for (int i = 0; i < getArrayStringEnumDefault().size(); i++) {
try { try {
joiner.add(String.format("%sarray_string_enum_default%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%sarray_string_enum_default%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
URLEncoder.encode(String.valueOf(getArrayStringEnumDefault().get(i)), "UTF-8").replaceAll("\\+", "%20"))); URLEncoder.encode(String.valueOf(getArrayStringEnumDefault().get(i)), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
@ -537,8 +538,8 @@ public class DefaultValue {
if (getArrayStringDefault() != null) { if (getArrayStringDefault() != null) {
for (int i = 0; i < getArrayStringDefault().size(); i++) { for (int i = 0; i < getArrayStringDefault().size(); i++) {
try { try {
joiner.add(String.format("%sarray_string_default%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%sarray_string_default%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
URLEncoder.encode(String.valueOf(getArrayStringDefault().get(i)), "UTF-8").replaceAll("\\+", "%20"))); URLEncoder.encode(String.valueOf(getArrayStringDefault().get(i)), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
@ -551,8 +552,8 @@ public class DefaultValue {
if (getArrayIntegerDefault() != null) { if (getArrayIntegerDefault() != null) {
for (int i = 0; i < getArrayIntegerDefault().size(); i++) { for (int i = 0; i < getArrayIntegerDefault().size(); i++) {
try { try {
joiner.add(String.format("%sarray_integer_default%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%sarray_integer_default%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
URLEncoder.encode(String.valueOf(getArrayIntegerDefault().get(i)), "UTF-8").replaceAll("\\+", "%20"))); URLEncoder.encode(String.valueOf(getArrayIntegerDefault().get(i)), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
@ -565,8 +566,8 @@ public class DefaultValue {
if (getArrayString() != null) { if (getArrayString() != null) {
for (int i = 0; i < getArrayString().size(); i++) { for (int i = 0; i < getArrayString().size(); i++) {
try { try {
joiner.add(String.format("%sarray_string%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%sarray_string%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
URLEncoder.encode(String.valueOf(getArrayString().get(i)), "UTF-8").replaceAll("\\+", "%20"))); URLEncoder.encode(String.valueOf(getArrayString().get(i)), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
@ -579,8 +580,8 @@ public class DefaultValue {
if (getArrayStringNullable() != null) { if (getArrayStringNullable() != null) {
for (int i = 0; i < getArrayStringNullable().size(); i++) { for (int i = 0; i < getArrayStringNullable().size(); i++) {
try { try {
joiner.add(String.format("%sarray_string_nullable%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%sarray_string_nullable%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
URLEncoder.encode(String.valueOf(getArrayStringNullable().get(i)), "UTF-8").replaceAll("\\+", "%20"))); URLEncoder.encode(String.valueOf(getArrayStringNullable().get(i)), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
@ -593,8 +594,8 @@ public class DefaultValue {
if (getArrayStringExtensionNullable() != null) { if (getArrayStringExtensionNullable() != null) {
for (int i = 0; i < getArrayStringExtensionNullable().size(); i++) { for (int i = 0; i < getArrayStringExtensionNullable().size(); i++) {
try { try {
joiner.add(String.format("%sarray_string_extension_nullable%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%sarray_string_extension_nullable%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
URLEncoder.encode(String.valueOf(getArrayStringExtensionNullable().get(i)), "UTF-8").replaceAll("\\+", "%20"))); URLEncoder.encode(String.valueOf(getArrayStringExtensionNullable().get(i)), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
@ -606,7 +607,7 @@ public class DefaultValue {
// add `string_nullable` to the URL query string // add `string_nullable` to the URL query string
if (getStringNullable() != null) { if (getStringNullable() != null) {
try { try {
joiner.add(String.format("%sstring_nullable%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getStringNullable()), "UTF-8").replaceAll("\\+", "%20"))); joiner.add(String.format(Locale.ROOT, "%sstring_nullable%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getStringNullable()), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
throw new RuntimeException(e); throw new RuntimeException(e);

7
samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java
View File

@ -15,6 +15,7 @@ package org.openapitools.client.model;
import java.util.Objects; import java.util.Objects;
import java.util.Arrays; import java.util.Arrays;
import java.util.Locale;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
@ -205,7 +206,7 @@ public class NumberPropertiesOnly {
// add `number` to the URL query string // add `number` to the URL query string
if (getNumber() != null) { if (getNumber() != null) {
try { try {
joiner.add(String.format("%snumber%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getNumber()), "UTF-8").replaceAll("\\+", "%20"))); joiner.add(String.format(Locale.ROOT, "%snumber%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getNumber()), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
throw new RuntimeException(e); throw new RuntimeException(e);
@ -215,7 +216,7 @@ public class NumberPropertiesOnly {
// add `float` to the URL query string // add `float` to the URL query string
if (getFloat() != null) { if (getFloat() != null) {
try { try {
joiner.add(String.format("%sfloat%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getFloat()), "UTF-8").replaceAll("\\+", "%20"))); joiner.add(String.format(Locale.ROOT, "%sfloat%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getFloat()), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
throw new RuntimeException(e); throw new RuntimeException(e);
@ -225,7 +226,7 @@ public class NumberPropertiesOnly {
// add `double` to the URL query string // add `double` to the URL query string
if (getDouble() != null) { if (getDouble() != null) {
try { try {
joiner.add(String.format("%sdouble%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getDouble()), "UTF-8").replaceAll("\\+", "%20"))); joiner.add(String.format(Locale.ROOT, "%sdouble%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getDouble()), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
throw new RuntimeException(e); throw new RuntimeException(e);

15
samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Pet.java
View File

@ -15,6 +15,7 @@ package org.openapitools.client.model;
import java.util.Objects; import java.util.Objects;
import java.util.Arrays; import java.util.Arrays;
import java.util.Locale;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
@ -356,7 +357,7 @@ public class Pet {
// add `id` to the URL query string // add `id` to the URL query string
if (getId() != null) { if (getId() != null) {
try { try {
joiner.add(String.format("%sid%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getId()), "UTF-8").replaceAll("\\+", "%20"))); joiner.add(String.format(Locale.ROOT, "%sid%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getId()), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
throw new RuntimeException(e); throw new RuntimeException(e);
@ -366,7 +367,7 @@ public class Pet {
// add `name` to the URL query string // add `name` to the URL query string
if (getName() != null) { if (getName() != null) {
try { try {
joiner.add(String.format("%sname%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getName()), "UTF-8").replaceAll("\\+", "%20"))); joiner.add(String.format(Locale.ROOT, "%sname%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getName()), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
throw new RuntimeException(e); throw new RuntimeException(e);
@ -382,8 +383,8 @@ public class Pet {
if (getPhotoUrls() != null) { if (getPhotoUrls() != null) {
for (int i = 0; i < getPhotoUrls().size(); i++) { for (int i = 0; i < getPhotoUrls().size(); i++) {
try { try {
joiner.add(String.format("%sphotoUrls%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%sphotoUrls%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
URLEncoder.encode(String.valueOf(getPhotoUrls().get(i)), "UTF-8").replaceAll("\\+", "%20"))); URLEncoder.encode(String.valueOf(getPhotoUrls().get(i)), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
@ -396,8 +397,8 @@ public class Pet {
if (getTags() != null) { if (getTags() != null) {
for (int i = 0; i < getTags().size(); i++) { for (int i = 0; i < getTags().size(); i++) {
if (getTags().get(i) != null) { if (getTags().get(i) != null) {
joiner.add(getTags().get(i).toUrlQueryString(String.format("%stags%s%s", prefix, suffix, joiner.add(getTags().get(i).toUrlQueryString(String.format(Locale.ROOT, "%stags%s%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix)))); "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix))));
} }
} }
} }
@ -405,7 +406,7 @@ public class Pet {
// add `status` to the URL query string // add `status` to the URL query string
if (getStatus() != null) { if (getStatus() != null) {
try { try {
joiner.add(String.format("%sstatus%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getStatus()), "UTF-8").replaceAll("\\+", "%20"))); joiner.add(String.format(Locale.ROOT, "%sstatus%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getStatus()), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
throw new RuntimeException(e); throw new RuntimeException(e);

7
samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Query.java
View File

@ -15,6 +15,7 @@ package org.openapitools.client.model;
import java.util.Objects; import java.util.Objects;
import java.util.Arrays; import java.util.Arrays;
import java.util.Locale;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
@ -218,7 +219,7 @@ public class Query {
// add `id` to the URL query string // add `id` to the URL query string
if (getId() != null) { if (getId() != null) {
try { try {
joiner.add(String.format("%sid%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getId()), "UTF-8").replaceAll("\\+", "%20"))); joiner.add(String.format(Locale.ROOT, "%sid%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getId()), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
throw new RuntimeException(e); throw new RuntimeException(e);
@ -229,8 +230,8 @@ public class Query {
if (getOutcomes() != null) { if (getOutcomes() != null) {
for (int i = 0; i < getOutcomes().size(); i++) { for (int i = 0; i < getOutcomes().size(); i++) {
try { try {
joiner.add(String.format("%soutcomes%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%soutcomes%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
URLEncoder.encode(String.valueOf(getOutcomes().get(i)), "UTF-8").replaceAll("\\+", "%20"))); URLEncoder.encode(String.valueOf(getOutcomes().get(i)), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported

4
samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/StringEnumRef.java
View File

@ -15,6 +15,7 @@ package org.openapitools.client.model;
import java.util.Objects; import java.util.Objects;
import java.util.Arrays; import java.util.Arrays;
import java.util.Locale;
import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonTypeName;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
@ -23,6 +24,7 @@ import java.util.StringJoiner;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonValue;
import java.util.Locale;
/** /**
* Gets or Sets StringEnumRef * Gets or Sets StringEnumRef
@ -72,7 +74,7 @@ public enum StringEnumRef {
prefix = ""; prefix = "";
} }
return String.format("%s=%s", prefix, this.toString()); return String.format(Locale.ROOT, "%s=%s", prefix, this.toString());
} }
} }

5
samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Tag.java
View File

@ -15,6 +15,7 @@ package org.openapitools.client.model;
import java.util.Objects; import java.util.Objects;
import java.util.Arrays; import java.util.Arrays;
import java.util.Locale;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
@ -170,7 +171,7 @@ public class Tag {
// add `id` to the URL query string // add `id` to the URL query string
if (getId() != null) { if (getId() != null) {
try { try {
joiner.add(String.format("%sid%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getId()), "UTF-8").replaceAll("\\+", "%20"))); joiner.add(String.format(Locale.ROOT, "%sid%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getId()), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
throw new RuntimeException(e); throw new RuntimeException(e);
@ -180,7 +181,7 @@ public class Tag {
// add `name` to the URL query string // add `name` to the URL query string
if (getName() != null) { if (getName() != null) {
try { try {
joiner.add(String.format("%sname%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getName()), "UTF-8").replaceAll("\\+", "%20"))); joiner.add(String.format(Locale.ROOT, "%sname%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getName()), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
throw new RuntimeException(e); throw new RuntimeException(e);

3
samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarker.java
View File

@ -15,6 +15,7 @@ package org.openapitools.client.model;
import java.util.Objects; import java.util.Objects;
import java.util.Arrays; import java.util.Arrays;
import java.util.Locale;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
@ -139,7 +140,7 @@ public class TestFormObjectMultipartRequestMarker {
// add `name` to the URL query string // add `name` to the URL query string
if (getName() != null) { if (getName() != null) {
try { try {
joiner.add(String.format("%sname%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getName()), "UTF-8").replaceAll("\\+", "%20"))); joiner.add(String.format(Locale.ROOT, "%sname%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getName()), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
throw new RuntimeException(e); throw new RuntimeException(e);

9
samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java
View File

@ -15,6 +15,7 @@ package org.openapitools.client.model;
import java.util.Objects; import java.util.Objects;
import java.util.Arrays; import java.util.Arrays;
import java.util.Locale;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
@ -235,7 +236,7 @@ public class TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter
// add `size` to the URL query string // add `size` to the URL query string
if (getSize() != null) { if (getSize() != null) {
try { try {
joiner.add(String.format("%ssize%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getSize()), "UTF-8").replaceAll("\\+", "%20"))); joiner.add(String.format(Locale.ROOT, "%ssize%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getSize()), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
throw new RuntimeException(e); throw new RuntimeException(e);
@ -245,7 +246,7 @@ public class TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter
// add `color` to the URL query string // add `color` to the URL query string
if (getColor() != null) { if (getColor() != null) {
try { try {
joiner.add(String.format("%scolor%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getColor()), "UTF-8").replaceAll("\\+", "%20"))); joiner.add(String.format(Locale.ROOT, "%scolor%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getColor()), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
throw new RuntimeException(e); throw new RuntimeException(e);
@ -255,7 +256,7 @@ public class TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter
// add `id` to the URL query string // add `id` to the URL query string
if (getId() != null) { if (getId() != null) {
try { try {
joiner.add(String.format("%sid%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getId()), "UTF-8").replaceAll("\\+", "%20"))); joiner.add(String.format(Locale.ROOT, "%sid%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getId()), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
throw new RuntimeException(e); throw new RuntimeException(e);
@ -265,7 +266,7 @@ public class TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter
// add `name` to the URL query string // add `name` to the URL query string
if (getName() != null) { if (getName() != null) {
try { try {
joiner.add(String.format("%sname%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getName()), "UTF-8").replaceAll("\\+", "%20"))); joiner.add(String.format(Locale.ROOT, "%sname%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getName()), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported
throw new RuntimeException(e); throw new RuntimeException(e);

5
samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java
View File

@ -15,6 +15,7 @@ package org.openapitools.client.model;
import java.util.Objects; import java.util.Objects;
import java.util.Arrays; import java.util.Arrays;
import java.util.Locale;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
@ -151,8 +152,8 @@ public class TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter {
if (getValues() != null) { if (getValues() != null) {
for (int i = 0; i < getValues().size(); i++) { for (int i = 0; i < getValues().size(); i++) {
try { try {
joiner.add(String.format("%svalues%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%svalues%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
URLEncoder.encode(String.valueOf(getValues().get(i)), "UTF-8").replaceAll("\\+", "%20"))); URLEncoder.encode(String.valueOf(getValues().get(i)), "UTF-8").replaceAll("\\+", "%20")));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
// Should never happen, UTF-8 is always supported // Should never happen, UTF-8 is always supported

3
samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
View File

@ -15,6 +15,7 @@ package org.openapitools.client.auth;
import feign.RequestInterceptor; import feign.RequestInterceptor;
import feign.RequestTemplate; import feign.RequestTemplate;
import java.util.Locale;
public class ApiKeyAuth implements RequestInterceptor { public class ApiKeyAuth implements RequestInterceptor {
private final String location; private final String location;
@ -50,7 +51,7 @@ public class ApiKeyAuth implements RequestInterceptor {
} else if ("header".equals(location)) { } else if ("header".equals(location)) {
template.header(paramName, apiKey); template.header(paramName, apiKey);
} else if ("cookie".equals(location)) { } else if ("cookie".equals(location)) {
template.header("Cookie", String.format("%s=%s", paramName, apiKey)); template.header("Cookie", String.format(Locale.ROOT, "%s=%s", paramName, apiKey));
} }
} }
} }

1
samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Bird.java
View File

@ -15,6 +15,7 @@ package org.openapitools.client.model;
import java.util.Objects; import java.util.Objects;
import java.util.Arrays; import java.util.Arrays;
import java.util.Locale;
import com.google.gson.TypeAdapter; import com.google.gson.TypeAdapter;
import com.google.gson.annotations.JsonAdapter; import com.google.gson.annotations.JsonAdapter;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;

1
samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Category.java
View File

@ -15,6 +15,7 @@ package org.openapitools.client.model;
import java.util.Objects; import java.util.Objects;
import java.util.Arrays; import java.util.Arrays;
import java.util.Locale;
import com.google.gson.TypeAdapter; import com.google.gson.TypeAdapter;
import com.google.gson.annotations.JsonAdapter; import com.google.gson.annotations.JsonAdapter;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;

1
samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/DataQuery.java
View File

@ -15,6 +15,7 @@ package org.openapitools.client.model;
import java.util.Objects; import java.util.Objects;
import java.util.Arrays; import java.util.Arrays;
import java.util.Locale;
import com.google.gson.TypeAdapter; import com.google.gson.TypeAdapter;
import com.google.gson.annotations.JsonAdapter; import com.google.gson.annotations.JsonAdapter;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;

1
samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/DefaultValue.java
View File

@ -15,6 +15,7 @@ package org.openapitools.client.model;
import java.util.Objects; import java.util.Objects;
import java.util.Arrays; import java.util.Arrays;
import java.util.Locale;
import com.google.gson.TypeAdapter; import com.google.gson.TypeAdapter;
import com.google.gson.annotations.JsonAdapter; import com.google.gson.annotations.JsonAdapter;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;

1
samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java
View File

@ -15,6 +15,7 @@ package org.openapitools.client.model;
import java.util.Objects; import java.util.Objects;
import java.util.Arrays; import java.util.Arrays;
import java.util.Locale;
import com.google.gson.TypeAdapter; import com.google.gson.TypeAdapter;
import com.google.gson.annotations.JsonAdapter; import com.google.gson.annotations.JsonAdapter;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;

1
samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Pet.java
View File

@ -15,6 +15,7 @@ package org.openapitools.client.model;
import java.util.Objects; import java.util.Objects;
import java.util.Arrays; import java.util.Arrays;
import java.util.Locale;
import com.google.gson.TypeAdapter; import com.google.gson.TypeAdapter;
import com.google.gson.annotations.JsonAdapter; import com.google.gson.annotations.JsonAdapter;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;

1
samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Query.java
View File

@ -15,6 +15,7 @@ package org.openapitools.client.model;
import java.util.Objects; import java.util.Objects;
import java.util.Arrays; import java.util.Arrays;
import java.util.Locale;
import com.google.gson.TypeAdapter; import com.google.gson.TypeAdapter;
import com.google.gson.annotations.JsonAdapter; import com.google.gson.annotations.JsonAdapter;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;

2
samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/StringEnumRef.java
View File

@ -15,6 +15,7 @@ package org.openapitools.client.model;
import java.util.Objects; import java.util.Objects;
import java.util.Arrays; import java.util.Arrays;
import java.util.Locale;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
import java.io.IOException; import java.io.IOException;
@ -22,6 +23,7 @@ import com.google.gson.TypeAdapter;
import com.google.gson.annotations.JsonAdapter; import com.google.gson.annotations.JsonAdapter;
import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonWriter; import com.google.gson.stream.JsonWriter;
import java.util.Locale;
/** /**
* Gets or Sets StringEnumRef * Gets or Sets StringEnumRef

1
samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Tag.java
View File

@ -15,6 +15,7 @@ package org.openapitools.client.model;
import java.util.Objects; import java.util.Objects;
import java.util.Arrays; import java.util.Arrays;
import java.util.Locale;
import com.google.gson.TypeAdapter; import com.google.gson.TypeAdapter;
import com.google.gson.annotations.JsonAdapter; import com.google.gson.annotations.JsonAdapter;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;

1
samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarker.java
View File

@ -15,6 +15,7 @@ package org.openapitools.client.model;
import java.util.Objects; import java.util.Objects;
import java.util.Arrays; import java.util.Arrays;
import java.util.Locale;
import com.google.gson.TypeAdapter; import com.google.gson.TypeAdapter;
import com.google.gson.annotations.JsonAdapter; import com.google.gson.annotations.JsonAdapter;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;

1
samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java
View File

@ -15,6 +15,7 @@ package org.openapitools.client.model;
import java.util.Objects; import java.util.Objects;
import java.util.Arrays; import java.util.Arrays;
import java.util.Locale;
import com.google.gson.TypeAdapter; import com.google.gson.TypeAdapter;
import com.google.gson.annotations.JsonAdapter; import com.google.gson.annotations.JsonAdapter;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;

1
samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java
View File

@ -15,6 +15,7 @@ package org.openapitools.client.model;
import java.util.Objects; import java.util.Objects;
import java.util.Arrays; import java.util.Arrays;
import java.util.Locale;
import com.google.gson.TypeAdapter; import com.google.gson.TypeAdapter;
import com.google.gson.annotations.JsonAdapter; import com.google.gson.annotations.JsonAdapter;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;

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

@ -42,6 +42,7 @@ import java.util.StringJoiner;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.Locale;
import java.util.function.Consumer; import java.util.function.Consumer;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.16.0-SNAPSHOT") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.16.0-SNAPSHOT")

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

@ -52,6 +52,7 @@ import java.util.StringJoiner;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.Locale;
import java.util.function.Consumer; import java.util.function.Consumer;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.16.0-SNAPSHOT") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.16.0-SNAPSHOT")

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

@ -49,6 +49,7 @@ import java.util.StringJoiner;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.Locale;
import java.util.function.Consumer; import java.util.function.Consumer;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.16.0-SNAPSHOT") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.16.0-SNAPSHOT")

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

@ -49,6 +49,7 @@ import java.util.StringJoiner;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.Locale;
import java.util.function.Consumer; import java.util.function.Consumer;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.16.0-SNAPSHOT") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.16.0-SNAPSHOT")

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

@ -49,6 +49,7 @@ import java.util.StringJoiner;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.Locale;
import java.util.function.Consumer; import java.util.function.Consumer;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.16.0-SNAPSHOT") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.16.0-SNAPSHOT")

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

@ -55,6 +55,7 @@ import java.util.StringJoiner;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.Locale;
import java.util.function.Consumer; import java.util.function.Consumer;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.16.0-SNAPSHOT") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.16.0-SNAPSHOT")

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

@ -19,6 +19,7 @@ import java.util.StringJoiner;
import java.util.Objects; import java.util.Objects;
import java.util.Map; import java.util.Map;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
@ -173,12 +174,12 @@ public class Bird {
// add `size` to the URL query string // add `size` to the URL query string
if (getSize() != null) { if (getSize() != null) {
joiner.add(String.format("%ssize%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getSize())))); joiner.add(String.format(Locale.ROOT, "%ssize%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getSize()))));
} }
// add `color` to the URL query string // add `color` to the URL query string
if (getColor() != null) { if (getColor() != null) {
joiner.add(String.format("%scolor%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getColor())))); joiner.add(String.format(Locale.ROOT, "%scolor%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getColor()))));
} }
return joiner.toString(); return joiner.toString();

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

@ -19,6 +19,7 @@ import java.util.StringJoiner;
import java.util.Objects; import java.util.Objects;
import java.util.Map; import java.util.Map;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
@ -173,12 +174,12 @@ public class Category {
// add `id` to the URL query string // add `id` to the URL query string
if (getId() != null) { if (getId() != null) {
joiner.add(String.format("%sid%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getId())))); joiner.add(String.format(Locale.ROOT, "%sid%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getId()))));
} }
// add `name` to the URL query string // add `name` to the URL query string
if (getName() != null) { if (getName() != null) {
joiner.add(String.format("%sname%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getName())))); joiner.add(String.format(Locale.ROOT, "%sname%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getName()))));
} }
return joiner.toString(); return joiner.toString();

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

@ -19,6 +19,7 @@ import java.util.StringJoiner;
import java.util.Objects; import java.util.Objects;
import java.util.Map; import java.util.Map;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
@ -222,31 +223,31 @@ public class DataQuery extends Query {
// add `id` to the URL query string // add `id` to the URL query string
if (getId() != null) { if (getId() != null) {
joiner.add(String.format("%sid%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getId())))); joiner.add(String.format(Locale.ROOT, "%sid%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getId()))));
} }
// add `outcomes` to the URL query string // add `outcomes` to the URL query string
if (getOutcomes() != null) { if (getOutcomes() != null) {
for (int i = 0; i < getOutcomes().size(); i++) { for (int i = 0; i < getOutcomes().size(); i++) {
joiner.add(String.format("%soutcomes%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%soutcomes%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
ApiClient.urlEncode(ApiClient.valueToString(getOutcomes().get(i))))); ApiClient.urlEncode(ApiClient.valueToString(getOutcomes().get(i)))));
} }
} }
// add `suffix` to the URL query string // add `suffix` to the URL query string
if (getSuffix() != null) { if (getSuffix() != null) {
joiner.add(String.format("%ssuffix%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getSuffix())))); joiner.add(String.format(Locale.ROOT, "%ssuffix%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getSuffix()))));
} }
// add `text` to the URL query string // add `text` to the URL query string
if (getText() != null) { if (getText() != null) {
joiner.add(String.format("%stext%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getText())))); joiner.add(String.format(Locale.ROOT, "%stext%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getText()))));
} }
// add `date` to the URL query string // add `date` to the URL query string
if (getDate() != null) { if (getDate() != null) {
joiner.add(String.format("%sdate%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getDate())))); joiner.add(String.format(Locale.ROOT, "%sdate%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getDate()))));
} }
return joiner.toString(); return joiner.toString();

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

@ -19,6 +19,7 @@ import java.util.StringJoiner;
import java.util.Objects; import java.util.Objects;
import java.util.Map; import java.util.Map;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
@ -501,8 +502,8 @@ public class DefaultValue {
if (getArrayStringEnumRefDefault() != null) { if (getArrayStringEnumRefDefault() != null) {
for (int i = 0; i < getArrayStringEnumRefDefault().size(); i++) { for (int i = 0; i < getArrayStringEnumRefDefault().size(); i++) {
if (getArrayStringEnumRefDefault().get(i) != null) { if (getArrayStringEnumRefDefault().get(i) != null) {
joiner.add(String.format("%sarray_string_enum_ref_default%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%sarray_string_enum_ref_default%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
ApiClient.urlEncode(ApiClient.valueToString(getArrayStringEnumRefDefault().get(i))))); ApiClient.urlEncode(ApiClient.valueToString(getArrayStringEnumRefDefault().get(i)))));
} }
} }
@ -511,8 +512,8 @@ public class DefaultValue {
// add `array_string_enum_default` to the URL query string // add `array_string_enum_default` to the URL query string
if (getArrayStringEnumDefault() != null) { if (getArrayStringEnumDefault() != null) {
for (int i = 0; i < getArrayStringEnumDefault().size(); i++) { for (int i = 0; i < getArrayStringEnumDefault().size(); i++) {
joiner.add(String.format("%sarray_string_enum_default%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%sarray_string_enum_default%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
ApiClient.urlEncode(ApiClient.valueToString(getArrayStringEnumDefault().get(i))))); ApiClient.urlEncode(ApiClient.valueToString(getArrayStringEnumDefault().get(i)))));
} }
} }
@ -520,8 +521,8 @@ public class DefaultValue {
// add `array_string_default` to the URL query string // add `array_string_default` to the URL query string
if (getArrayStringDefault() != null) { if (getArrayStringDefault() != null) {
for (int i = 0; i < getArrayStringDefault().size(); i++) { for (int i = 0; i < getArrayStringDefault().size(); i++) {
joiner.add(String.format("%sarray_string_default%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%sarray_string_default%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
ApiClient.urlEncode(ApiClient.valueToString(getArrayStringDefault().get(i))))); ApiClient.urlEncode(ApiClient.valueToString(getArrayStringDefault().get(i)))));
} }
} }
@ -529,8 +530,8 @@ public class DefaultValue {
// add `array_integer_default` to the URL query string // add `array_integer_default` to the URL query string
if (getArrayIntegerDefault() != null) { if (getArrayIntegerDefault() != null) {
for (int i = 0; i < getArrayIntegerDefault().size(); i++) { for (int i = 0; i < getArrayIntegerDefault().size(); i++) {
joiner.add(String.format("%sarray_integer_default%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%sarray_integer_default%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
ApiClient.urlEncode(ApiClient.valueToString(getArrayIntegerDefault().get(i))))); ApiClient.urlEncode(ApiClient.valueToString(getArrayIntegerDefault().get(i)))));
} }
} }
@ -538,8 +539,8 @@ public class DefaultValue {
// add `array_string` to the URL query string // add `array_string` to the URL query string
if (getArrayString() != null) { if (getArrayString() != null) {
for (int i = 0; i < getArrayString().size(); i++) { for (int i = 0; i < getArrayString().size(); i++) {
joiner.add(String.format("%sarray_string%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%sarray_string%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
ApiClient.urlEncode(ApiClient.valueToString(getArrayString().get(i))))); ApiClient.urlEncode(ApiClient.valueToString(getArrayString().get(i)))));
} }
} }
@ -547,8 +548,8 @@ public class DefaultValue {
// add `array_string_nullable` to the URL query string // add `array_string_nullable` to the URL query string
if (getArrayStringNullable() != null) { if (getArrayStringNullable() != null) {
for (int i = 0; i < getArrayStringNullable().size(); i++) { for (int i = 0; i < getArrayStringNullable().size(); i++) {
joiner.add(String.format("%sarray_string_nullable%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%sarray_string_nullable%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
ApiClient.urlEncode(ApiClient.valueToString(getArrayStringNullable().get(i))))); ApiClient.urlEncode(ApiClient.valueToString(getArrayStringNullable().get(i)))));
} }
} }
@ -556,15 +557,15 @@ public class DefaultValue {
// add `array_string_extension_nullable` to the URL query string // add `array_string_extension_nullable` to the URL query string
if (getArrayStringExtensionNullable() != null) { if (getArrayStringExtensionNullable() != null) {
for (int i = 0; i < getArrayStringExtensionNullable().size(); i++) { for (int i = 0; i < getArrayStringExtensionNullable().size(); i++) {
joiner.add(String.format("%sarray_string_extension_nullable%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%sarray_string_extension_nullable%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
ApiClient.urlEncode(ApiClient.valueToString(getArrayStringExtensionNullable().get(i))))); ApiClient.urlEncode(ApiClient.valueToString(getArrayStringExtensionNullable().get(i)))));
} }
} }
// add `string_nullable` to the URL query string // add `string_nullable` to the URL query string
if (getStringNullable() != null) { if (getStringNullable() != null) {
joiner.add(String.format("%sstring_nullable%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getStringNullable())))); joiner.add(String.format(Locale.ROOT, "%sstring_nullable%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getStringNullable()))));
} }
return joiner.toString(); return joiner.toString();

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

@ -19,6 +19,7 @@ import java.util.StringJoiner;
import java.util.Objects; import java.util.Objects;
import java.util.Map; import java.util.Map;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
@ -207,17 +208,17 @@ public class NumberPropertiesOnly {
// add `number` to the URL query string // add `number` to the URL query string
if (getNumber() != null) { if (getNumber() != null) {
joiner.add(String.format("%snumber%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getNumber())))); joiner.add(String.format(Locale.ROOT, "%snumber%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getNumber()))));
} }
// add `float` to the URL query string // add `float` to the URL query string
if (getFloat() != null) { if (getFloat() != null) {
joiner.add(String.format("%sfloat%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getFloat())))); joiner.add(String.format(Locale.ROOT, "%sfloat%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getFloat()))));
} }
// add `double` to the URL query string // add `double` to the URL query string
if (getDouble() != null) { if (getDouble() != null) {
joiner.add(String.format("%sdouble%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getDouble())))); joiner.add(String.format(Locale.ROOT, "%sdouble%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getDouble()))));
} }
return joiner.toString(); return joiner.toString();

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

@ -19,6 +19,7 @@ import java.util.StringJoiner;
import java.util.Objects; import java.util.Objects;
import java.util.Map; import java.util.Map;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
@ -354,12 +355,12 @@ public class Pet {
// add `id` to the URL query string // add `id` to the URL query string
if (getId() != null) { if (getId() != null) {
joiner.add(String.format("%sid%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getId())))); joiner.add(String.format(Locale.ROOT, "%sid%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getId()))));
} }
// add `name` to the URL query string // add `name` to the URL query string
if (getName() != null) { if (getName() != null) {
joiner.add(String.format("%sname%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getName())))); joiner.add(String.format(Locale.ROOT, "%sname%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getName()))));
} }
// add `category` to the URL query string // add `category` to the URL query string
@ -370,8 +371,8 @@ public class Pet {
// add `photoUrls` to the URL query string // add `photoUrls` to the URL query string
if (getPhotoUrls() != null) { if (getPhotoUrls() != null) {
for (int i = 0; i < getPhotoUrls().size(); i++) { for (int i = 0; i < getPhotoUrls().size(); i++) {
joiner.add(String.format("%sphotoUrls%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%sphotoUrls%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
ApiClient.urlEncode(ApiClient.valueToString(getPhotoUrls().get(i))))); ApiClient.urlEncode(ApiClient.valueToString(getPhotoUrls().get(i)))));
} }
} }
@ -380,15 +381,15 @@ public class Pet {
if (getTags() != null) { if (getTags() != null) {
for (int i = 0; i < getTags().size(); i++) { for (int i = 0; i < getTags().size(); i++) {
if (getTags().get(i) != null) { if (getTags().get(i) != null) {
joiner.add(getTags().get(i).toUrlQueryString(String.format("%stags%s%s", prefix, suffix, joiner.add(getTags().get(i).toUrlQueryString(String.format(Locale.ROOT, "%stags%s%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix)))); "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix))));
} }
} }
} }
// add `status` to the URL query string // add `status` to the URL query string
if (getStatus() != null) { if (getStatus() != null) {
joiner.add(String.format("%sstatus%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getStatus())))); joiner.add(String.format(Locale.ROOT, "%sstatus%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getStatus()))));
} }
return joiner.toString(); return joiner.toString();

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

@ -19,6 +19,7 @@ import java.util.StringJoiner;
import java.util.Objects; import java.util.Objects;
import java.util.Map; import java.util.Map;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
@ -220,14 +221,14 @@ public class Query {
// add `id` to the URL query string // add `id` to the URL query string
if (getId() != null) { if (getId() != null) {
joiner.add(String.format("%sid%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getId())))); joiner.add(String.format(Locale.ROOT, "%sid%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getId()))));
} }
// add `outcomes` to the URL query string // add `outcomes` to the URL query string
if (getOutcomes() != null) { if (getOutcomes() != null) {
for (int i = 0; i < getOutcomes().size(); i++) { for (int i = 0; i < getOutcomes().size(); i++) {
joiner.add(String.format("%soutcomes%s%s=%s", prefix, suffix, joiner.add(String.format(Locale.ROOT, "%soutcomes%s%s=%s", prefix, suffix,
"".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), "".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
ApiClient.urlEncode(ApiClient.valueToString(getOutcomes().get(i))))); ApiClient.urlEncode(ApiClient.valueToString(getOutcomes().get(i)))));
} }
} }

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

@ -19,11 +19,13 @@ import java.util.StringJoiner;
import java.util.Objects; import java.util.Objects;
import java.util.Map; import java.util.Map;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale;
import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonValue;
import java.util.Locale;
/** /**
* Gets or Sets StringEnumRef * Gets or Sets StringEnumRef
@ -73,7 +75,7 @@ public enum StringEnumRef {
prefix = ""; prefix = "";
} }
return String.format("%s=%s", prefix, this.toString()); return String.format(Locale.ROOT, "%s=%s", prefix, this.toString());
} }
} }

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

@ -19,6 +19,7 @@ import java.util.StringJoiner;
import java.util.Objects; import java.util.Objects;
import java.util.Map; import java.util.Map;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
@ -173,12 +174,12 @@ public class Tag {
// add `id` to the URL query string // add `id` to the URL query string
if (getId() != null) { if (getId() != null) {
joiner.add(String.format("%sid%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getId())))); joiner.add(String.format(Locale.ROOT, "%sid%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getId()))));
} }
// add `name` to the URL query string // add `name` to the URL query string
if (getName() != null) { if (getName() != null) {
joiner.add(String.format("%sname%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getName())))); joiner.add(String.format(Locale.ROOT, "%sname%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getName()))));
} }
return joiner.toString(); return joiner.toString();

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

@ -19,6 +19,7 @@ import java.util.StringJoiner;
import java.util.Objects; import java.util.Objects;
import java.util.Map; import java.util.Map;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
@ -142,7 +143,7 @@ public class TestFormObjectMultipartRequestMarker {
// add `name` to the URL query string // add `name` to the URL query string
if (getName() != null) { if (getName() != null) {
joiner.add(String.format("%sname%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getName())))); joiner.add(String.format(Locale.ROOT, "%sname%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getName()))));
} }
return joiner.toString(); return joiner.toString();

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

@ -19,6 +19,7 @@ import java.util.StringJoiner;
import java.util.Objects; import java.util.Objects;
import java.util.Map; import java.util.Map;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
@ -235,22 +236,22 @@ public class TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter
// add `size` to the URL query string // add `size` to the URL query string
if (getSize() != null) { if (getSize() != null) {
joiner.add(String.format("%ssize%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getSize())))); joiner.add(String.format(Locale.ROOT, "%ssize%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getSize()))));
} }
// add `color` to the URL query string // add `color` to the URL query string
if (getColor() != null) { if (getColor() != null) {
joiner.add(String.format("%scolor%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getColor())))); joiner.add(String.format(Locale.ROOT, "%scolor%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getColor()))));
} }
// add `id` to the URL query string // add `id` to the URL query string
if (getId() != null) { if (getId() != null) {
joiner.add(String.format("%sid%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getId())))); joiner.add(String.format(Locale.ROOT, "%sid%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getId()))));
} }
// add `name` to the URL query string // add `name` to the URL query string
if (getName() != null) { if (getName() != null) {
joiner.add(String.format("%sname%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getName())))); joiner.add(String.format(Locale.ROOT, "%sname%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getName()))));
} }
return joiner.toString(); return joiner.toString();

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