Skip to content

Commit d120eb0

Browse files
spencergibbspencergibb
committed
Updates to*Case() to use Locale.ROOT
1 parent 8f9c17f commit d120eb0

File tree

83 files changed

+262
-178
lines changed

Some content is hidden

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

83 files changed

+262
-178
lines changed

‎spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoopTest.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package org.springframework.cloud.function.adapter.aws;
1818

19+
import java.util.Locale;
1920
import java.util.function.Function;
2021

2122
import org.junit.jupiter.api.Test;
@@ -219,7 +220,7 @@ public void test_definitionLookupAndComposition() throws Exception {
219220
protected static class SingleFunctionConfiguration {
220221
@Bean
221222
public Function<String, String> uppercase() {
222-
return v -> v.toUpperCase();
223+
return v -> v.toUpperCase(Locale.ROOT);
223224
}
224225
}
225226

@@ -236,7 +237,7 @@ public Function<Flux<String>, Flux<String>> uppercase() {
236237
protected static class MultipleFunctionConfiguration {
237238
@Bean
238239
public Function<String, String> uppercase() {
239-
return v -> v.toUpperCase();
240+
return v -> v.toUpperCase(Locale.ROOT);
240241
}
241242

242243
@Bean
@@ -246,7 +247,7 @@ public Function<String, String> toPersonJson() {
246247

247248
@Bean
248249
public Function<Person, Person> uppercasePerson() {
249-
return p -> new Person(p.getName().toUpperCase());
250+
return p -> new Person(p.getName().toUpperCase(Locale.ROOT));
250251
}
251252

252253
@Bean
@@ -267,7 +268,7 @@ public PersonFunction() {
267268

268269
@Override
269270
public Person apply(Person input) {
270-
return new Person(input.getName().toUpperCase());
271+
return new Person(input.getName().toUpperCase(Locale.ROOT));
271272
}
272273
}
273274

‎spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import java.util.Base64;
2626
import java.util.Collections;
2727
import java.util.List;
28+
import java.util.Locale;
2829
import java.util.Map;
2930
import java.util.function.Consumer;
3031
import java.util.function.Function;
@@ -1492,7 +1493,7 @@ public static class BasicConfiguration {
14921493
@Bean
14931494
public Function<Message<String>, Message<String>> uppercase() {
14941495
return v -> {
1495-
return MessageBuilder.withPayload(v.getPayload().toUpperCase()).build();
1496+
return MessageBuilder.withPayload(v.getPayload().toUpperCase(Locale.ROOT)).build();
14961497
};
14971498
}
14981499
}
@@ -1525,7 +1526,7 @@ public Function<String, String> echoString() {
15251526

15261527
@Bean
15271528
public Function<String, String> uppercase() {
1528-
return v -> v.toUpperCase();
1529+
return v -> v.toUpperCase(Locale.ROOT);
15291530
}
15301531

15311532
@Bean
@@ -1784,7 +1785,7 @@ public Consumer<String> consume() {
17841785

17851786
@Bean
17861787
public Function<String, String> uppercase() {
1787-
return v -> v.toUpperCase();
1788+
return v -> v.toUpperCase(Locale.ROOT);
17881789
}
17891790

17901791
@Bean
@@ -1795,15 +1796,15 @@ public Function<Mono<String>, Mono<Void>> reactiveWithVoidReturn() {
17951796
@Bean
17961797
public Function<Person, String> uppercasePojo() {
17971798
return v -> {
1798-
return v.getName().toUpperCase();
1799+
return v.getName().toUpperCase(Locale.ROOT);
17991800
};
18001801
}
18011802

18021803
@Bean
18031804
public Function<Person, Person> uppercasePojoReturnPojo() {
18041805
return v -> {
18051806
Person p = new Person();
1806-
p.setName(v.getName().toUpperCase());
1807+
p.setName(v.getName().toUpperCase(Locale.ROOT));
18071808
return p;
18081809
};
18091810
}
@@ -1812,7 +1813,7 @@ public Function<Person, Person> uppercasePojoReturnPojo() {
18121813
public Function<Flux<Person>, Flux<Person>> uppercasePojoReturnPojoReactive() {
18131814
return flux -> flux.map(v -> {
18141815
Person p = new Person();
1815-
p.setName(v.getName().toUpperCase());
1816+
p.setName(v.getName().toUpperCase(Locale.ROOT));
18161817
return p;
18171818
});
18181819
}

‎spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/test/java/org/springframework/cloud/function/adapter/azure/CustomFunctionInvokerTests.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import java.util.Arrays;
2020
import java.util.List;
21+
import java.util.Locale;
2122
import java.util.function.Function;
2223
import java.util.stream.Collectors;
2324

@@ -184,7 +185,7 @@ static class TestFunctionsConfig {
184185

185186
@Bean
186187
public Function<String, String> imperativeUppercase() {
187-
return (s) -> s.toUpperCase();
188+
return (s) -> s.toUpperCase(Locale.ROOT);
188189
}
189190

190191
@Bean

‎spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/test/java/org/springframework/cloud/function/adapter/azure/FunctionInvokerTests.java‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.io.IOException;
2020
import java.util.Arrays;
2121
import java.util.List;
22+
import java.util.Locale;
2223
import java.util.function.Consumer;
2324
import java.util.function.Function;
2425
import java.util.function.Supplier;
@@ -195,7 +196,7 @@ public Function<Flux<String>, Flux<String>> echoStream() {
195196

196197
@Bean
197198
public Function<Mono<String>, Mono<String>> uppercaseMono() {
198-
return f -> f.map(v -> v.toUpperCase());
199+
return f -> f.map(v -> v.toUpperCase(Locale.ROOT));
199200
}
200201

201202
}
@@ -241,7 +242,7 @@ protected static class BareConfig {
241242

242243
@Bean("uppercase")
243244
public Function<Flux<Foo>, Flux<Bar>> function() {
244-
return foos -> foos.map(foo -> new Bar(foo.getValue().toUpperCase()));
245+
return foos -> foos.map(foo -> new Bar(foo.getValue().toUpperCase(Locale.ROOT)));
245246
}
246247

247248
}
@@ -256,7 +257,7 @@ public Function<Message<Foo>, Bar> uppercase() {
256257
Foo foo = message.getPayload();
257258
ExecutionContext targetContext = (ExecutionContext) message.getHeaders().get("executionContext");
258259
targetContext.getLogger().info("Invoking 'uppercase' on " + foo.getValue());
259-
return new Bar(foo.getValue().toUpperCase());
260+
return new Bar(foo.getValue().toUpperCase(Locale.ROOT));
260261
};
261262
}
262263

@@ -269,7 +270,7 @@ protected static class ListConfig {
269270
@Bean
270271
public Function<List<Foo>, List<Bar>> uppercase() {
271272
return foos -> {
272-
List<Bar> bars = foos.stream().map(foo -> new Bar(foo.getValue().toUpperCase()))
273+
List<Bar> bars = foos.stream().map(foo -> new Bar(foo.getValue().toUpperCase(Locale.ROOT)))
273274
.collect(Collectors.toList());
274275
return bars;
275276
};
@@ -283,7 +284,7 @@ protected static class CollectConfig {
283284

284285
@Bean
285286
public Function<List<Foo>, Bar> uppercase() {
286-
return foos -> new Bar(foos.stream().map(foo -> foo.getValue().toUpperCase())
287+
return foos -> new Bar(foos.stream().map(foo -> foo.getValue().toUpperCase(Locale.ROOT))
287288
.collect(Collectors.joining(",")));
288289
}
289290

@@ -300,7 +301,7 @@ public Function<Message<Foo>, Bar> uppercase() {
300301
ExecutionContext context = (ExecutionContext) message.getHeaders().get("executionContext");
301302
Foo foo = message.getPayload();
302303
context.getLogger().info("Executing uppercase function");
303-
return new Bar(foo.getValue().toUpperCase());
304+
return new Bar(foo.getValue().toUpperCase(Locale.ROOT));
304305
};
305306
}
306307

@@ -310,7 +311,7 @@ public Function<Message<Bar>, Foo> lowercase() {
310311
ExecutionContext context = (ExecutionContext) message.getHeaders().get("executionContext");
311312
Bar bar = message.getPayload();
312313
context.getLogger().info("Executing lowercase function");
313-
return new Foo(bar.getValue().toLowerCase());
314+
return new Foo(bar.getValue().toLowerCase(Locale.ROOT));
314315
};
315316
}
316317

@@ -330,11 +331,11 @@ class Foo {
330331
}
331332

332333
public String lowercase() {
333-
return this.value.toLowerCase();
334+
return this.value.toLowerCase(Locale.ROOT);
334335
}
335336

336337
public String uppercase() {
337-
return this.value.toUpperCase();
338+
return this.value.toUpperCase(Locale.ROOT);
338339
}
339340

340341
public String getValue() {

‎spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/test/java/org/springframework/cloud/function/adapter/azure/HttpFunctionInvokerTests.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.net.URISyntaxException;
2222
import java.util.Collections;
2323
import java.util.HashMap;
24+
import java.util.Locale;
2425
import java.util.Map;
2526
import java.util.function.Consumer;
2627
import java.util.function.Function;
@@ -122,7 +123,7 @@ public Function<Message<Foo>, Message<Bar>> function() {
122123
return (foo -> {
123124
Map<String, Object> headers = new HashMap<>();
124125
return new GenericMessage<>(
125-
new Bar(foo.getPayload().getValue().toUpperCase()), headers);
126+
new Bar(foo.getPayload().getValue().toUpperCase(Locale.ROOT)), headers);
126127
});
127128
}
128129

‎spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/test/java/org/springframework/cloud/function/adapter/azure/injector/AzureFunctionInstanceInjectorTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package org.springframework.cloud.function.adapter.azure.injector;
1818

19+
import java.util.Locale;
1920
import java.util.Optional;
2021
import java.util.function.Function;
2122

@@ -106,7 +107,7 @@ public Function<Message<String>, String> uppercaseBean() {
106107
Assertions.assertThat(context).isNotNull();
107108
Assertions.assertThat(context.getFunctionName()).isEqualTo("hello");
108109

109-
return message.getPayload().toUpperCase();
110+
return message.getPayload().toUpperCase(Locale.ROOT);
110111
};
111112

112113
}

‎spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/test/java/org/springframework/cloud/function/adapter/azure/injector/FunctionInstanceInjectorServiceLoadingTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.springframework.cloud.function.adapter.azure.injector;
1818

1919
import java.util.Iterator;
20+
import java.util.Locale;
2021
import java.util.Optional;
2122
import java.util.ServiceLoader;
2223
import java.util.function.Function;
@@ -108,7 +109,7 @@ public Function<Message<String>, String> uppercase() {
108109
.get(AzureFunctionUtil.EXECUTION_CONTEXT);
109110
Assertions.assertThat(context).isNotNull();
110111
Assertions.assertThat(context.getFunctionName()).isEqualTo("hello");
111-
return message.getPayload().toUpperCase();
112+
return message.getPayload().toUpperCase(Locale.ROOT);
112113
};
113114
}
114115
}

‎spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/integration/FunctionInvokerIntegrationTests.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.springframework.cloud.function.adapter.gcp.integration;
1818

1919
import java.io.IOException;
20+
import java.util.Locale;
2021
import java.util.function.Function;
2122
import java.util.function.Supplier;
2223

@@ -98,7 +99,7 @@ static class CloudFunctionMainSingular {
9899

99100
@Bean
100101
Function<String, String> uppercase() {
101-
return input -> input.toUpperCase();
102+
return input -> input.toUpperCase(Locale.ROOT);
102103
}
103104

104105
}
@@ -109,7 +110,7 @@ static class CloudFunctionMain {
109110

110111
@Bean
111112
Function<String, String> uppercase() {
112-
return input -> input.toUpperCase();
113+
return input -> input.toUpperCase(Locale.ROOT);
113114
}
114115

115116
@Bean

‎spring-cloud-function-adapters/spring-cloud-function-grpc/src/test/java/org/springframework/cloud/function/grpc/GrpcInteractionTests.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.time.Duration;
2020
import java.util.ArrayList;
2121
import java.util.List;
22+
import java.util.Locale;
2223
import java.util.Random;
2324
import java.util.function.Function;
2425

@@ -323,17 +324,17 @@ public static class SampleConfiguration {
323324

324325
@Bean
325326
public Function<String, String> uppercase() {
326-
return v -> v.toUpperCase();
327+
return v -> v.toUpperCase(Locale.ROOT);
327328
}
328329

329330
@Bean
330331
public Function<String, Mono<String>> uppercaseMonoReturn() {
331-
return v -> Mono.just(v.toUpperCase());
332+
return v -> Mono.just(v.toUpperCase(Locale.ROOT));
332333
}
333334

334335
@Bean
335336
public Function<String, Flux<String>> uppercaseFluxReturn() {
336-
return v -> Flux.just(v.toUpperCase(), v.toUpperCase() + "-1", v.toUpperCase() + "-2");
337+
return v -> Flux.just(v.toUpperCase(Locale.ROOT), v.toUpperCase(Locale.ROOT) + "-1", v.toUpperCase(Locale.ROOT) + "-2");
337338
}
338339

339340
@Bean
@@ -343,7 +344,7 @@ public Function<String, String> reverse() {
343344

344345
@Bean
345346
public Function<Flux<String>, Flux<String>> uppercaseReactive() {
346-
return flux -> flux.map(v -> v.toUpperCase());
347+
return flux -> flux.map(v -> v.toUpperCase(Locale.ROOT));
347348
}
348349

349350
@Bean
@@ -360,7 +361,7 @@ public Function<Flux<String>, String> streamInStringOut() {
360361

361362
@Bean
362363
public Function<String, Flux<String>> stringInStreamOut() {
363-
return value -> Flux.just(value, value.toUpperCase());
364+
return value -> Flux.just(value, value.toUpperCase(Locale.ROOT));
364365
}
365366
}
366367
}

‎spring-cloud-function-adapters/spring-cloud-function-serverless-web/src/main/java/org/springframework/cloud/function/serverless/web/ServerlessWebApplication.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.io.PrintStream;
2121
import java.util.ArrayList;
2222
import java.util.List;
23+
import java.util.Locale;
2324
import java.util.Set;
2425
import java.util.function.Consumer;
2526

@@ -157,7 +158,7 @@ private Banner printBanner(ConfigurableEnvironment environment) {
157158
ResourceLoader resourceLoader = (this.getResourceLoader() != null) ? this.getResourceLoader()
158159
: new DefaultResourceLoader(null);
159160
Banner.Mode bannerMode = environment.containsProperty("spring.main.banner-mode")
160-
? Banner.Mode.valueOf(environment.getProperty("spring.main.banner-mode").trim().toUpperCase())
161+
? Banner.Mode.valueOf(environment.getProperty("spring.main.banner-mode").trim().toUpperCase(Locale.ROOT))
161162
: Banner.Mode.CONSOLE;
162163

163164
if (bannerMode == Banner.Mode.OFF) {

0 commit comments

Comments
 (0)