Merge branch 'trunk' into renovate/io.lettuce-lettuce-core-6.x

Author: pujagani

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

@@ -17,6 +17,8 @@
 
 package org.openqa.selenium;
 
+import java.util.Locale;
+
 /**
  * Represents the known architectures used in WebDriver. It attempts to smooth over some of Java's
  * rough edges when dealing with microprocessor architectures by, for instance, allowing you to
@@ -98,7 +100,7 @@ public int getDataModel() {
 
   @Override
   public String toString() {
-    return name().toLowerCase();
+    return name().toLowerCase(Locale.ENGLISH);
   }
 
   /**
@@ -121,7 +123,7 @@ public static Architecture getCurrent() {
    */
   public static Architecture extractFromSysProperty(String arch) {
     if (arch != null) {
-      arch = arch.toLowerCase();
+      arch = arch.toLowerCase(Locale.ENGLISH);
     }
 
     // Some architectures are basically the same even though they have different names.  ia32, x86,

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

@@ -18,6 +18,7 @@
 package org.openqa.selenium;
 
 import java.util.Arrays;
+import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -414,7 +415,7 @@ public static Platform extractFromSysProperty(String osName) {
    * @return the most likely platform based on given operating system name and version
    */
   public static Platform extractFromSysProperty(String osName, String osVersion) {
-    osName = osName.toLowerCase();
+    osName = osName.toLowerCase(Locale.ENGLISH);
     // os.name for android is linux
     if ("dalvik".equalsIgnoreCase(System.getProperty("java.vm.name"))) {
       return Platform.ANDROID;
@@ -434,7 +435,7 @@ public static Platform extractFromSysProperty(String osName, String osVersion) {
         if ("".equals(matcher)) {
           continue;
         }
-        matcher = matcher.toLowerCase();
+        matcher = matcher.toLowerCase(Locale.ENGLISH);
         if (os.isExactMatch(osName, matcher)) {
           return os;
         }

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

@@ -20,6 +20,7 @@
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
@@ -93,7 +94,8 @@ public Proxy() {
   public Proxy(Map<String, ?> raw) {
     Map<String, Consumer<Object>> setters = new HashMap<>();
     setters.put(
-        PROXY_TYPE, value -> setProxyType(ProxyType.valueOf(((String) value).toUpperCase())));
+        PROXY_TYPE,
+        value -> setProxyType(ProxyType.valueOf(((String) value).toUpperCase(Locale.ENGLISH))));
     setters.put(FTP_PROXY, value -> setFtpProxy((String) value));
     setters.put(HTTP_PROXY, value -> setHttpProxy((String) value));
     setters.put(
@@ -448,7 +450,7 @@ public String toString() {
       case DIRECT:
       case MANUAL:
       case SYSTEM:
-        builder.append(getProxyType().toString().toLowerCase());
+        builder.append(getProxyType().toString().toLowerCase(Locale.ENGLISH));
         break;
 
       case PAC:

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

@@ -29,6 +29,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.WebDriverException;
@@ -300,7 +301,7 @@ protected List<String> createArgs() {
       }
 
       if (logLevel != null) {
-        args.add(String.format("--log-level=%s", logLevel.toString().toUpperCase()));
+        args.add(String.format("--log-level=%s", logLevel.toString().toUpperCase(Locale.ENGLISH)));
       }
       if (allowedListIps != null) {
         args.add(String.format("--allowed-ips=%s", allowedListIps));

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

@@ -17,6 +17,7 @@
 
 package org.openqa.selenium.chromium;
 
+import java.util.Locale;
 import java.util.Map;
 import java.util.logging.Level;
 
@@ -46,7 +47,7 @@ public enum ChromiumDriverLogLevel {
 
   @Override
   public String toString() {
-    return super.toString().toLowerCase();
+    return super.toString().toLowerCase(Locale.ENGLISH);
   }
 
   public static ChromiumDriverLogLevel fromString(String text) {

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

@@ -19,6 +19,7 @@
 
 import static org.openqa.selenium.remote.http.Contents.utf8String;
 
+import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
 import org.openqa.selenium.WebDriver;
@@ -105,7 +106,7 @@ public void close() {
   protected HttpMethod convertFromCdpHttpMethod(String method) {
     Require.nonNull("HTTP Method", method);
     try {
-      return HttpMethod.valueOf(method.toUpperCase());
+      return HttpMethod.valueOf(method.toUpperCase(Locale.ENGLISH));
     } catch (IllegalArgumentException e) {
       // Spam in a reasonable value
       return HttpMethod.GET;

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

@@ -26,6 +26,7 @@
 import java.util.Base64;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.CancellationException;
@@ -300,7 +301,7 @@ protected Optional<Credentials> getAuthCredentials(URI uri) {
   protected HttpMethod convertFromCdpHttpMethod(String method) {
     Require.nonNull("HTTP Method", method);
     try {
-      return HttpMethod.valueOf(method.toUpperCase());
+      return HttpMethod.valueOf(method.toUpperCase(Locale.ENGLISH));
     } catch (IllegalArgumentException e) {
       // Spam in a reasonable value
       return HttpMethod.GET;

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

@@ -27,6 +27,7 @@
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.WebDriverException;
@@ -294,7 +295,7 @@ protected List<String> createArgs() {
       }
 
       if (logLevel != null) {
-        args.add(String.format("--log-level=%s", logLevel.toString().toUpperCase()));
+        args.add(String.format("--log-level=%s", logLevel.toString().toUpperCase(Locale.ENGLISH)));
       }
       if (Boolean.TRUE.equals(silent)) {
         args.add("--silent");

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

@@ -30,6 +30,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -72,7 +73,7 @@ public String toString() {
      * @return the Channel enum value matching the parameter
      */
     public static Channel fromString(String name) {
-      final String lcName = name.toLowerCase();
+      final String lcName = name.toLowerCase(Locale.ENGLISH);
       return stream(Channel.values())
           .filter(ch -> ch.name.equals(lcName))
           .findFirst()

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

@@ -18,6 +18,7 @@
 package org.openqa.selenium.firefox;
 
 import java.util.Collections;
+import java.util.Locale;
 import java.util.Map;
 import java.util.logging.Level;
 
@@ -47,7 +48,7 @@ public enum FirefoxDriverLogLevel {
 
   @Override
   public String toString() {
-    return super.toString().toLowerCase();
+    return super.toString().toLowerCase(Locale.ENGLISH);
   }
 
   public static FirefoxDriverLogLevel fromString(String text) {