Skip to content

Commit 348095e

Browse files
ChrimleChrimle
committed
Use Locale-class Via Fully Qualified Name
Signed-off-by: Chrimle <[email protected]>
1 parent 8f4b7af commit 348095e

Some content is hidden

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

45 files changed

+273
-273
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
694694
if (serverIndex != null) {
695695
if (serverIndex < 0 || serverIndex >= servers.size()) {
696696
throw new ArrayIndexOutOfBoundsException(String.format(
697-
Locale.ROOT,
697+
java.util.Locale.ROOT,
698698
"Invalid index %d when selecting the host settings. Must be less than %d", serverIndex, servers.size()
699699
));
700700
}

‎modules/openapi-generator/src/main/resources/Java/JSON.mustache‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ public class JSON {
6666
public Class<? extends {{classname}}> getClassForElement(JsonElement readElement) {
6767
Map<String, Class> classByDiscriminatorValue = new HashMap<String, Class>();
6868
{{#mappedModels}}
69-
classByDiscriminatorValue.put("{{mappingName}}"{{^discriminatorCaseSensitive}}.toUpperCase(Locale.ROOT){{/discriminatorCaseSensitive}}, {{modelName}}.class);
69+
classByDiscriminatorValue.put("{{mappingName}}"{{^discriminatorCaseSensitive}}.toUpperCase(java.util.Locale.ROOT){{/discriminatorCaseSensitive}}, {{modelName}}.class);
7070
{{/mappedModels}}
71-
classByDiscriminatorValue.put("{{name}}"{{^discriminatorCaseSensitive}}.toUpperCase(Locale.ROOT){{/discriminatorCaseSensitive}}, {{classname}}.class);
71+
classByDiscriminatorValue.put("{{name}}"{{^discriminatorCaseSensitive}}.toUpperCase(java.util.Locale.ROOT){{/discriminatorCaseSensitive}}, {{classname}}.class);
7272
return getClassByDiscriminator(classByDiscriminatorValue,
7373
getDiscriminatorValue(readElement, "{{{propertyBaseName}}}"));
7474
}
@@ -100,7 +100,7 @@ public class JSON {
100100
* @return The Java class that implements the OpenAPI schema
101101
*/
102102
private static Class getClassByDiscriminator(Map classByDiscriminatorValue, String discriminatorValue) {
103-
Class clazz = (Class) classByDiscriminatorValue.get(discriminatorValue{{^discriminatorCaseSensitive}}.toUpperCase(Locale.ROOT){{/discriminatorCaseSensitive}});
103+
Class clazz = (Class) classByDiscriminatorValue.get(discriminatorValue{{^discriminatorCaseSensitive}}.toUpperCase(java.util.Locale.ROOT){{/discriminatorCaseSensitive}});
104104
if (null == clazz) {
105105
throw new IllegalArgumentException("cannot determine model class of name: <" + discriminatorValue + ">");
106106
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -929,7 +929,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
929929
if (serverIndex != null) {
930930
if (serverIndex < 0 || serverIndex >= servers.size()) {
931931
throw new ArrayIndexOutOfBoundsException(String.format(
932-
Locale.ROOT,
932+
java.util.Locale.ROOT,
933933
"Invalid index %d when selecting the host settings. Must be less than %d", serverIndex, servers.size()
934934
));
935935
}

‎modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/api.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public class {{classname}} extends BaseApi {
115115
localVarQueryParameterBaseName = "{{{baseName}}}";
116116
{{#isArray}}
117117
for (int i=0; i < {{paramName}}.size(); i++) {
118-
localVarQueryStringJoiner.add({{paramName}}.get(i).toUrlQueryString(String.format(Locale.ROOT, "{{baseName}}[%d]", i)));
118+
localVarQueryStringJoiner.add({{paramName}}.get(i).toUrlQueryString(String.format(java.util.Locale.ROOT, "{{baseName}}[%d]", i)));
119119
}
120120
{{/isArray}}
121121
{{^isArray}}

‎modules/openapi-generator/src/main/resources/Java/libraries/feign/auth/ApiKeyAuth.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public class ApiKeyAuth implements RequestInterceptor {
3939
} else if ("header".equals(location)) {
4040
template.header(paramName, apiKey);
4141
} else if ("cookie".equals(location)) {
42-
template.header("Cookie", String.format(Locale.ROOT, "%s=%s", paramName, apiKey));
42+
template.header("Cookie", String.format(java.util.Locale.ROOT, "%s=%s", paramName, apiKey));
4343
}
4444
}
4545
}

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -366,8 +366,8 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
366366
int i = 0;
367367
for ({{items.dataType}} _item : {{getter}}()) {
368368
try {
369-
joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
370-
"".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
369+
joiner.add(String.format(java.util.Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
370+
"".equals(suffix) ? "" : String.format(java.util.Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
371371
URLEncoder.encode(String.valueOf(_item), "UTF-8").replaceAll("\\+", "%20")));
372372
} catch (UnsupportedEncodingException e) {
373373
// Should never happen, UTF-8 is always supported
@@ -381,8 +381,8 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
381381
if ({{getter}}() != null) {
382382
for (int i = 0; i < {{getter}}().size(); i++) {
383383
try {
384-
joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
385-
"".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
384+
joiner.add(String.format(java.util.Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
385+
"".equals(suffix) ? "" : String.format(java.util.Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
386386
URLEncoder.encode(String.valueOf({{getter}}().get(i)), "UTF-8").replaceAll("\\+", "%20")));
387387
} catch (UnsupportedEncodingException e) {
388388
// Should never happen, UTF-8 is always supported
@@ -399,8 +399,8 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
399399
int i = 0;
400400
for ({{items.dataType}} _item : {{getter}}()) {
401401
if (_item != null) {
402-
joiner.add(_item.toUrlQueryString(String.format(Locale.ROOT, "%s{{baseName}}%s%s", prefix, suffix,
403-
"".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix))));
402+
joiner.add(_item.toUrlQueryString(String.format(java.util.Locale.ROOT, "%s{{baseName}}%s%s", prefix, suffix,
403+
"".equals(suffix) ? "" : String.format(java.util.Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix))));
404404
}
405405
}
406406
i++;
@@ -410,8 +410,8 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
410410
if ({{getter}}() != null) {
411411
for (int i = 0; i < {{getter}}().size(); i++) {
412412
if ({{getter}}().get(i) != null) {
413-
joiner.add({{getter}}().get(i).toUrlQueryString(String.format(Locale.ROOT, "%s{{baseName}}%s%s", prefix, suffix,
414-
"".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix))));
413+
joiner.add({{getter}}().get(i).toUrlQueryString(String.format(java.util.Locale.ROOT, "%s{{baseName}}%s%s", prefix, suffix,
414+
"".equals(suffix) ? "" : String.format(java.util.Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix))));
415415
}
416416
}
417417
}
@@ -424,8 +424,8 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
424424
for ({{items.dataType}} _item : {{getter}}()) {
425425
if (_item != null) {
426426
try {
427-
joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
428-
"".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
427+
joiner.add(String.format(java.util.Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
428+
"".equals(suffix) ? "" : String.format(java.util.Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
429429
URLEncoder.encode(String.valueOf(_item), "UTF-8").replaceAll("\\+", "%20")));
430430
} catch (UnsupportedEncodingException e) {
431431
// Should never happen, UTF-8 is always supported
@@ -441,8 +441,8 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
441441
for (int i = 0; i < {{getter}}().size(); i++) {
442442
if ({{getter}}().get(i) != null) {
443443
try {
444-
joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
445-
"".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
444+
joiner.add(String.format(java.util.Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
445+
"".equals(suffix) ? "" : String.format(java.util.Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
446446
URLEncoder.encode(String.valueOf({{getter}}().get(i)), "UTF-8").replaceAll("\\+", "%20")));
447447
} catch (UnsupportedEncodingException e) {
448448
// Should never happen, UTF-8 is always supported
@@ -461,8 +461,8 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
461461
if ({{getter}}() != null) {
462462
for (String _key : {{getter}}().keySet()) {
463463
try {
464-
joiner.add(String.format(Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
465-
"".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, _key, containerSuffix),
464+
joiner.add(String.format(java.util.Locale.ROOT, "%s{{baseName}}%s%s=%s", prefix, suffix,
465+
"".equals(suffix) ? "" : String.format(java.util.Locale.ROOT, "%s%d%s", containerPrefix, _key, containerSuffix),
466466
{{getter}}().get(_key), URLEncoder.encode(String.valueOf({{getter}}().get(_key)), "UTF-8").replaceAll("\\+", "%20")));
467467
} catch (UnsupportedEncodingException e) {
468468
// Should never happen, UTF-8 is always supported
@@ -475,8 +475,8 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
475475
if ({{getter}}() != null) {
476476
for (String _key : {{getter}}().keySet()) {
477477
if ({{getter}}().get(_key) != null) {
478-
joiner.add({{getter}}().get(_key).toUrlQueryString(String.format(Locale.ROOT, "%s{{baseName}}%s%s", prefix, suffix,
479-
"".equals(suffix) ? "" : String.format(Locale.ROOT, "%s%d%s", containerPrefix, _key, containerSuffix))));
478+
joiner.add({{getter}}().get(_key).toUrlQueryString(String.format(java.util.Locale.ROOT, "%s{{baseName}}%s%s", prefix, suffix,
479+
"".equals(suffix) ? "" : String.format(java.util.Locale.ROOT, "%s%d%s", containerPrefix, _key, containerSuffix))));
480480
}
481481
}
482482
}
@@ -486,7 +486,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
486486
{{#isPrimitiveType}}
487487
if ({{getter}}() != null) {
488488
try {
489-
joiner.add(String.format(Locale.ROOT, "%s{{{baseName}}}%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf({{{getter}}}()), "UTF-8").replaceAll("\\+", "%20")));
489+
joiner.add(String.format(java.util.Locale.ROOT, "%s{{{baseName}}}%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf({{{getter}}}()), "UTF-8").replaceAll("\\+", "%20")));
490490
} catch (UnsupportedEncodingException e) {
491491
// Should never happen, UTF-8 is always supported
492492
throw new RuntimeException(e);
@@ -502,7 +502,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
502502
{{^isModel}}
503503
if ({{getter}}() != null) {
504504
try {
505-
joiner.add(String.format(Locale.ROOT, "%s{{{baseName}}}%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf({{{getter}}}()), "UTF-8").replaceAll("\\+", "%20")));
505+
joiner.add(String.format(java.util.Locale.ROOT, "%s{{{baseName}}}%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf({{{getter}}}()), "UTF-8").replaceAll("\\+", "%20")));
506506
} catch (UnsupportedEncodingException e) {
507507
// Should never happen, UTF-8 is always supported
508508
throw new RuntimeException(e);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1223,7 +1223,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
12231223
if (index < 0 || index >= serverConfigurations.size()) {
12241224
throw new ArrayIndexOutOfBoundsException(
12251225
String.format(
1226-
Locale.ROOT,
1226+
java.util.Locale.ROOT,
12271227
"Invalid index %d when selecting the host settings. Must be less than %d",
12281228
index, serverConfigurations.size()));
12291229
}

‎modules/openapi-generator/src/main/resources/Java/libraries/jersey2/oneof_model.mustache‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
7070
return new{{classname}};
7171
{{/mappedModels}}
7272
default:
73-
log.log(Level.WARNING, String.format(Locale.ROOT, "Failed to lookup discriminator value `%s` for {{classname}}. Possible values:{{#mappedModels}} {{{mappingName}}}{{/mappedModels}}", discriminatorValue));
73+
log.log(Level.WARNING, String.format(java.util.Locale.ROOT, "Failed to lookup discriminator value `%s` for {{classname}}. Possible values:{{#mappedModels}} {{{mappingName}}}{{/mappedModels}}", discriminatorValue));
7474
}
7575

7676
{{/discriminator}}
@@ -157,7 +157,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
157157
ret.setActualInstance(deserialized);
158158
return ret;
159159
}
160-
throw new IOException(String.format(Locale.ROOT, "Failed deserialization for {{classname}}: %d classes match result, expected 1", match));
160+
throw new IOException(String.format(java.util.Locale.ROOT, "Failed deserialization for {{classname}}: %d classes match result, expected 1", match));
161161
}
162162

163163
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1223,7 +1223,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
12231223
if (index < 0 || index >= serverConfigurations.size()) {
12241224
throw new ArrayIndexOutOfBoundsException(
12251225
String.format(
1226-
Locale.ROOT,
1226+
java.util.Locale.ROOT,
12271227
"Invalid index %d when selecting the host settings. Must be less than %d",
12281228
index, serverConfigurations.size()));
12291229
}

‎modules/openapi-generator/src/main/resources/Java/libraries/jersey3/oneof_model.mustache‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
7070
return new{{classname}};
7171
{{/mappedModels}}
7272
default:
73-
log.log(Level.WARNING, String.format(Locale.ROOT, "Failed to lookup discriminator value `%s` for {{classname}}. Possible values:{{#mappedModels}} {{{mappingName}}}{{/mappedModels}}", discriminatorValue));
73+
log.log(Level.WARNING, String.format(java.util.Locale.ROOT, "Failed to lookup discriminator value `%s` for {{classname}}. Possible values:{{#mappedModels}} {{{mappingName}}}{{/mappedModels}}", discriminatorValue));
7474
}
7575

7676
{{/discriminator}}
@@ -157,7 +157,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
157157
ret.setActualInstance(deserialized);
158158
return ret;
159159
}
160-
throw new IOException(String.format(Locale.ROOT, "Failed deserialization for {{classname}}: %d classes match result, expected 1", match));
160+
throw new IOException(String.format(java.util.Locale.ROOT, "Failed deserialization for {{classname}}: %d classes match result, expected 1", match));
161161
}
162162

163163
/**

0 commit comments

Comments
 (0)