Skip to content

Commit 9e25438

Browse files
joerg1985sandeepsuryaprasad
authored andcommitted
[java] use Local.ENGLISH for lower / upper case transformations SeleniumHQ#14916
1 parent c73f9d9 commit 9e25438

29 files changed

+89
-46
lines changed

java/src/org/openqa/selenium/Architecture.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717

1818
package org.openqa.selenium;
1919

20+
import java.util.Locale;
21+
2022
/**
2123
* Represents the known architectures used in WebDriver. It attempts to smooth over some of Java's
2224
* rough edges when dealing with microprocessor architectures by, for instance, allowing you to
@@ -98,7 +100,7 @@ public int getDataModel() {
98100

99101
@Override
100102
public String toString() {
101-
return name().toLowerCase();
103+
return name().toLowerCase(Locale.ENGLISH);
102104
}
103105

104106
/**
@@ -121,7 +123,7 @@ public static Architecture getCurrent() {
121123
*/
122124
public static Architecture extractFromSysProperty(String arch) {
123125
if (arch != null) {
124-
arch = arch.toLowerCase();
126+
arch = arch.toLowerCase(Locale.ENGLISH);
125127
}
126128

127129
// Some architectures are basically the same even though they have different names. ia32, x86,

java/src/org/openqa/selenium/Platform.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
package org.openqa.selenium;
1919

2020
import java.util.Arrays;
21+
import java.util.Locale;
2122
import java.util.regex.Matcher;
2223
import java.util.regex.Pattern;
2324

@@ -414,7 +415,7 @@ public static Platform extractFromSysProperty(String osName) {
414415
* @return the most likely platform based on given operating system name and version
415416
*/
416417
public static Platform extractFromSysProperty(String osName, String osVersion) {
417-
osName = osName.toLowerCase();
418+
osName = osName.toLowerCase(Locale.ENGLISH);
418419
// os.name for android is linux
419420
if ("dalvik".equalsIgnoreCase(System.getProperty("java.vm.name"))) {
420421
return Platform.ANDROID;
@@ -434,7 +435,7 @@ public static Platform extractFromSysProperty(String osName, String osVersion) {
434435
if ("".equals(matcher)) {
435436
continue;
436437
}
437-
matcher = matcher.toLowerCase();
438+
matcher = matcher.toLowerCase(Locale.ENGLISH);
438439
if (os.isExactMatch(osName, matcher)) {
439440
return os;
440441
}

java/src/org/openqa/selenium/Proxy.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.util.Arrays;
2121
import java.util.HashMap;
2222
import java.util.List;
23+
import java.util.Locale;
2324
import java.util.Map;
2425
import java.util.Objects;
2526
import java.util.Optional;
@@ -93,7 +94,8 @@ public Proxy() {
9394
public Proxy(Map<String, ?> raw) {
9495
Map<String, Consumer<Object>> setters = new HashMap<>();
9596
setters.put(
96-
PROXY_TYPE, value -> setProxyType(ProxyType.valueOf(((String) value).toUpperCase())));
97+
PROXY_TYPE,
98+
value -> setProxyType(ProxyType.valueOf(((String) value).toUpperCase(Locale.ENGLISH))));
9799
setters.put(FTP_PROXY, value -> setFtpProxy((String) value));
98100
setters.put(HTTP_PROXY, value -> setHttpProxy((String) value));
99101
setters.put(
@@ -448,7 +450,7 @@ public String toString() {
448450
case DIRECT:
449451
case MANUAL:
450452
case SYSTEM:
451-
builder.append(getProxyType().toString().toLowerCase());
453+
builder.append(getProxyType().toString().toLowerCase(Locale.ENGLISH));
452454
break;
453455

454456
case PAC:

java/src/org/openqa/selenium/chrome/ChromeDriverService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import java.util.ArrayList;
3030
import java.util.HashMap;
3131
import java.util.List;
32+
import java.util.Locale;
3233
import java.util.Map;
3334
import org.openqa.selenium.Capabilities;
3435
import org.openqa.selenium.WebDriverException;
@@ -300,7 +301,7 @@ protected List<String> createArgs() {
300301
}
301302

302303
if (logLevel != null) {
303-
args.add(String.format("--log-level=%s", logLevel.toString().toUpperCase()));
304+
args.add(String.format("--log-level=%s", logLevel.toString().toUpperCase(Locale.ENGLISH)));
304305
}
305306
if (allowedListIps != null) {
306307
args.add(String.format("--allowed-ips=%s", allowedListIps));

java/src/org/openqa/selenium/chromium/ChromiumDriverLogLevel.java

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

1818
package org.openqa.selenium.chromium;
1919

20+
import java.util.Locale;
2021
import java.util.Map;
2122
import java.util.logging.Level;
2223

@@ -46,7 +47,7 @@ public enum ChromiumDriverLogLevel {
4647

4748
@Override
4849
public String toString() {
49-
return super.toString().toLowerCase();
50+
return super.toString().toLowerCase(Locale.ENGLISH);
5051
}
5152

5253
public static ChromiumDriverLogLevel fromString(String text) {

java/src/org/openqa/selenium/devtools/NetworkInterceptor.java

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

2020
import static org.openqa.selenium.remote.http.Contents.utf8String;
2121

22+
import java.util.Locale;
2223
import java.util.Map;
2324
import java.util.Optional;
2425
import org.openqa.selenium.WebDriver;
@@ -105,7 +106,7 @@ public void close() {
105106
protected HttpMethod convertFromCdpHttpMethod(String method) {
106107
Require.nonNull("HTTP Method", method);
107108
try {
108-
return HttpMethod.valueOf(method.toUpperCase());
109+
return HttpMethod.valueOf(method.toUpperCase(Locale.ENGLISH));
109110
} catch (IllegalArgumentException e) {
110111
// Spam in a reasonable value
111112
return HttpMethod.GET;

java/src/org/openqa/selenium/devtools/idealized/Network.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import java.util.Base64;
2727
import java.util.LinkedHashMap;
2828
import java.util.List;
29+
import java.util.Locale;
2930
import java.util.Map;
3031
import java.util.Optional;
3132
import java.util.concurrent.CancellationException;
@@ -300,7 +301,7 @@ protected Optional<Credentials> getAuthCredentials(URI uri) {
300301
protected HttpMethod convertFromCdpHttpMethod(String method) {
301302
Require.nonNull("HTTP Method", method);
302303
try {
303-
return HttpMethod.valueOf(method.toUpperCase());
304+
return HttpMethod.valueOf(method.toUpperCase(Locale.ENGLISH));
304305
} catch (IllegalArgumentException e) {
305306
// Spam in a reasonable value
306307
return HttpMethod.GET;

java/src/org/openqa/selenium/edge/EdgeDriverService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import java.time.Duration;
2828
import java.util.ArrayList;
2929
import java.util.List;
30+
import java.util.Locale;
3031
import java.util.Map;
3132
import org.openqa.selenium.Capabilities;
3233
import org.openqa.selenium.WebDriverException;
@@ -294,7 +295,7 @@ protected List<String> createArgs() {
294295
}
295296

296297
if (logLevel != null) {
297-
args.add(String.format("--log-level=%s", logLevel.toString().toUpperCase()));
298+
args.add(String.format("--log-level=%s", logLevel.toString().toUpperCase(Locale.ENGLISH)));
298299
}
299300
if (Boolean.TRUE.equals(silent)) {
300301
args.add("--silent");

java/src/org/openqa/selenium/firefox/FirefoxBinary.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import java.util.ArrayList;
3131
import java.util.Collections;
3232
import java.util.List;
33+
import java.util.Locale;
3334
import java.util.Map;
3435
import java.util.Optional;
3536
import java.util.stream.Collectors;
@@ -72,7 +73,7 @@ public String toString() {
7273
* @return the Channel enum value matching the parameter
7374
*/
7475
public static Channel fromString(String name) {
75-
final String lcName = name.toLowerCase();
76+
final String lcName = name.toLowerCase(Locale.ENGLISH);
7677
return stream(Channel.values())
7778
.filter(ch -> ch.name.equals(lcName))
7879
.findFirst()

java/src/org/openqa/selenium/firefox/FirefoxDriverLogLevel.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
package org.openqa.selenium.firefox;
1919

2020
import java.util.Collections;
21+
import java.util.Locale;
2122
import java.util.Map;
2223
import java.util.logging.Level;
2324

@@ -47,7 +48,7 @@ public enum FirefoxDriverLogLevel {
4748

4849
@Override
4950
public String toString() {
50-
return super.toString().toLowerCase();
51+
return super.toString().toLowerCase(Locale.ENGLISH);
5152
}
5253

5354
public static FirefoxDriverLogLevel fromString(String text) {

0 commit comments

Comments
 (0)