Skip to content

Commit 149fdcb

Browse files
ChrimleChrimle
authored
[Java] Use Fully Qualified Name for java.util.Locale in Generated Classes (#22342)
* Remove Imports of `Locale` from all `model.mustache`-files Signed-off-by: Chrimle <[email protected]> * Remove Imports of `Locale` from all `modelEnum.mustache`-files Signed-off-by: Chrimle <[email protected]> * Remove Imports of `Locale` from all `oneof_model.mustache`-files Signed-off-by: Chrimle <[email protected]> * Remove Imports of `Locale` from all `api.mustache`-files Signed-off-by: Chrimle <[email protected]> * Remove Imports of `Locale` from all `anyof_model.mustache`-files Signed-off-by: Chrimle <[email protected]> * Remove Imports of `Locale` from all `pojo.mustache`-files Signed-off-by: Chrimle <[email protected]> * Remove Imports of `Locale` from all `ApiClient.mustache`-files Signed-off-by: Chrimle <[email protected]> * Remove Imports of `Locale` from all `ApiKeyAuth.mustache`-files Signed-off-by: Chrimle <[email protected]> * Remove Imports of `Locale` from all `JSON.mustache`-files Signed-off-by: Chrimle <[email protected]> * Remove Imports of `Locale` from all `HttpSignatureAuth.mustache`-files Signed-off-by: Chrimle <[email protected]> * Remove Imports of `Locale` from all `Play24CallFactory.mustache`-files Signed-off-by: Chrimle <[email protected]> * Remove Imports of `Locale` from all `Play25CallFactory.mustache`-files Signed-off-by: Chrimle <[email protected]> * Remove Imports of `Locale` from all `Play26CallFactory.mustache`-files Signed-off-by: Chrimle <[email protected]> * Remove Imports of `Locale` from all `apiException.mustache`-files Signed-off-by: Chrimle <[email protected]> * Remove Imports of `Locale` from all `clientConfiguration.mustache`-files Signed-off-by: Chrimle <[email protected]> * Remove Imports of `Locale` from all `RequestFactory.mustache`-files Signed-off-by: Chrimle <[email protected]> * Remove Imports of `Locale` from all `httpLoggingFilter.mustache`-files Signed-off-by: Chrimle <[email protected]> * Remove Imports of `Locale` from all `securityApiUtils.mustache`-files Signed-off-by: Chrimle <[email protected]> * Remove Imports of `Locale` from all `validatorUtils.mustache`-files Signed-off-by: Chrimle <[email protected]> * Use `Locale`-class Via Fully Qualified Name Signed-off-by: Chrimle <[email protected]> * Update Generated 'sample'-files Signed-off-by: Chrimle <[email protected]> * Revert Changes * Inline `Locale` Imports Signed-off-by: Chrimle <[email protected]> * Update Generated 'source' Files Signed-off-by: Chrimle <[email protected]> * Update `kotlin-spring/model.mustache` Signed-off-by: Chrimle <[email protected]> * Update Generated 'sample' Files Signed-off-by: Chrimle <[email protected]> * Update Generated 'sample' Files Signed-off-by: Chrimle <[email protected]> * Update Generated 'java-feign-hc5' Sample Files Signed-off-by: Chrimle <[email protected]> * Update Generated Sample Files Signed-off-by: Chrimle <[email protected]> * Update Generated Kotlin Sample Files Signed-off-by: Chrimle <[email protected]> --------- Signed-off-by: Chrimle <[email protected]>
1 parent e1edb9e commit 149fdcb

File tree

2,627 files changed

+2442
-5489
lines changed

Some content is hidden

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

2,627 files changed

+2442
-5489
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ import java.util.Arrays;
4141
import java.util.ArrayList;
4242
import java.util.Date;
4343
import java.util.TimeZone;
44-
import java.util.Locale;
4544

4645
import java.net.URLEncoder;
4746

@@ -695,7 +694,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
695694
if (serverIndex != null) {
696695
if (serverIndex < 0 || serverIndex >= servers.size()) {
697696
throw new ArrayIndexOutOfBoundsException(String.format(
698-
Locale.ROOT,
697+
java.util.Locale.ROOT,
699698
"Invalid index %d when selecting the host settings. Must be less than %d", serverIndex, servers.size()
700699
));
701700
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ import java.util.ArrayList;
5050
import java.util.Date;
5151
import java.util.function.Supplier;
5252
import java.util.TimeZone;
53-
import java.util.Locale;
5453
import java.util.regex.Matcher;
5554
import java.util.regex.Pattern;
5655

@@ -930,7 +929,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
930929
if (serverIndex != null) {
931930
if (serverIndex < 0 || serverIndex >= servers.size()) {
932931
throw new ArrayIndexOutOfBoundsException(String.format(
933-
Locale.ROOT,
932+
java.util.Locale.ROOT,
934933
"Invalid index %d when selecting the host settings. Must be less than %d", serverIndex, servers.size()
935934
));
936935
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import java.util.ArrayList;
2020
import java.util.Collections;
2121
import java.util.HashMap;
2222
import java.util.List;
23-
import java.util.Locale;
2423
import java.util.Map;
2524
import java.util.StringJoiner;
2625

@@ -116,7 +115,7 @@ public class {{classname}} extends BaseApi {
116115
localVarQueryParameterBaseName = "{{{baseName}}}";
117116
{{#isArray}}
118117
for (int i=0; i < {{paramName}}.size(); i++) {
119-
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)));
120119
}
121120
{{/isArray}}
122121
{{^isArray}}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ package {{invokerPackage}}.auth;
44

55
import feign.RequestInterceptor;
66
import feign.RequestTemplate;
7-
import java.util.Locale;
87

98
public class ApiKeyAuth implements RequestInterceptor {
109
private final String location;
@@ -40,7 +39,7 @@ public class ApiKeyAuth implements RequestInterceptor {
4039
} else if ("header".equals(location)) {
4140
template.header(paramName, apiKey);
4241
} else if ("cookie".equals(location)) {
43-
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));
4443
}
4544
}
4645
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import com.fasterxml.jackson.annotation.JsonAnySetter;
1818
{{/models}}
1919
import java.util.Objects;
2020
import java.util.Arrays;
21-
import java.util.Locale;
2221
{{#imports}}
2322
import {{import}};
2423
{{/imports}}

‎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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ import java.util.List;
5454
import java.util.Arrays;
5555
import java.util.ArrayList;
5656
import java.util.Date;
57-
import java.util.Locale;
5857
import java.util.stream.Collectors;
5958
import java.util.stream.Stream;
6059
{{#jsr310}}
@@ -1224,7 +1223,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
12241223
if (index < 0 || index >= serverConfigurations.size()) {
12251224
throw new ArrayIndexOutOfBoundsException(
12261225
String.format(
1227-
Locale.ROOT,
1226+
java.util.Locale.ROOT,
12281227
"Invalid index %d when selecting the host settings. Must be less than %d",
12291228
index, serverConfigurations.size()));
12301229
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import com.fasterxml.jackson.annotation.JsonAnySetter;
1919
import java.util.Objects;
2020
import java.util.Map;
2121
import java.util.HashMap;
22-
import java.util.Locale;
2322
{{#imports}}
2423
import {{import}};
2524
{{/imports}}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import java.util.logging.Logger;
66
import java.util.ArrayList;
77
import java.util.Collections;
88
import java.util.HashSet;
9-
import java.util.Locale;
109

1110
import com.fasterxml.jackson.core.JsonGenerator;
1211
import com.fasterxml.jackson.core.JsonParser;
@@ -71,7 +70,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
7170
return new{{classname}};
7271
{{/mappedModels}}
7372
default:
74-
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));
7574
}
7675

7776
{{/discriminator}}
@@ -158,7 +157,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
158157
ret.setActualInstance(deserialized);
159158
return ret;
160159
}
161-
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));
162161
}
163162

164163
/**

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ import java.util.List;
5454
import java.util.Arrays;
5555
import java.util.ArrayList;
5656
import java.util.Date;
57-
import java.util.Locale;
5857
import java.util.stream.Collectors;
5958
import java.util.stream.Stream;
6059
{{#jsr310}}
@@ -1224,7 +1223,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
12241223
if (index < 0 || index >= serverConfigurations.size()) {
12251224
throw new ArrayIndexOutOfBoundsException(
12261225
String.format(
1227-
Locale.ROOT,
1226+
java.util.Locale.ROOT,
12281227
"Invalid index %d when selecting the host settings. Must be less than %d",
12291228
index, serverConfigurations.size()));
12301229
}

0 commit comments

Comments
 (0)