[java] change chromium service names from whitelisted to allowed (#11409)

titusfortner · web-flow · commit 4a30da61cf2a · 2022-12-12T15:06:28.000+01:00
diff --git a/java/src/org/openqa/selenium/chrome/ChromeDriverService.java b/java/src/org/openqa/selenium/chrome/ChromeDriverService.java
@@ -82,6 +82,14 @@ public class ChromeDriverService extends DriverService {
    * System property that defines comma-separated list of remote IPv4 addresses which are
    * allowed to connect to ChromeDriver.
    */
+  public static final String CHROME_DRIVER_ALLOWED_IPS_PROPERTY = "webdriver.chrome.withAllowedIps";
+
+  /**
+   * System property that defines comma-separated list of remote IPv4 addresses which are
+   * allowed to connect to ChromeDriver.
+   * @deprecated use {@link #CHROME_DRIVER_ALLOWED_IPS_PROPERTY}
+   */
+  @Deprecated
   public static final String CHROME_DRIVER_WHITELISTED_IPS_PROPERTY = "webdriver.chrome.whitelistedIps";
 
   /**
@@ -164,7 +172,8 @@ public static class Builder extends DriverService.Builder<
     private boolean appendLog = Boolean.getBoolean(CHROME_DRIVER_APPEND_LOG_PROPERTY);
     private boolean verbose = Boolean.getBoolean(CHROME_DRIVER_VERBOSE_LOG_PROPERTY);
     private boolean silent = Boolean.getBoolean(CHROME_DRIVER_SILENT_OUTPUT_PROPERTY);
-    private String whitelistedIps = System.getProperty(CHROME_DRIVER_WHITELISTED_IPS_PROPERTY);
+    private String allowedListIps = System.getProperty(CHROME_DRIVER_ALLOWED_IPS_PROPERTY,
+      System.getProperty(CHROME_DRIVER_WHITELISTED_IPS_PROPERTY));
     private ChromeDriverLogLevel logLevel = ChromeDriverLogLevel.fromString(System.getProperty(CHROME_DRIVER_LOG_LEVEL_PROPERTY));
 
     @Override
@@ -250,11 +259,13 @@ public Builder withSilent(boolean silent) {
      * Configures the comma-separated list of remote IPv4 addresses which are allowed to connect
      * to the driver server.
      *
-     * @param whitelistedIps Comma-separated list of remote IPv4 addresses.
+     * @param allowedListIps Comma-separated list of remote IPv4 addresses.
      * @return A self reference.
+     * @deprecated use {@link #withAllowedListIps(String)}
      */
-    public Builder withWhitelistedIps(String whitelistedIps) {
-      this.whitelistedIps = whitelistedIps;
+    @Deprecated
+    public Builder withWhitelistedIps(String allowedListIps) {
+      this.allowedListIps = allowedListIps;
       return this;
     }
 
@@ -310,8 +321,8 @@ protected List<String> createArgs() {
       if (logLevel != null) {
         args.add(String.format("--log-level=%s", logLevel.toString().toUpperCase()));
       }
-      if (whitelistedIps != null) {
-        args.add(String.format("--whitelisted-ips=%s", whitelistedIps));
+      if (allowedListIps != null) {
+        args.add(String.format("--allowed-ips=%s", allowedListIps));
       }
       if (disableBuildCheck) {
         args.add("--disable-build-check");
diff --git a/java/src/org/openqa/selenium/edge/EdgeDriverService.java b/java/src/org/openqa/selenium/edge/EdgeDriverService.java
@@ -281,7 +281,7 @@ protected List<String> createArgs() {
         args.add(String.format("--log-level=%s", logLevel));
       }
       if (allowedListIps != null) {
-        args.add(String.format("--whitelisted-ips=%s", allowedListIps));
+        args.add(String.format("--allowed-ips=%s", allowedListIps));
       }
       if (disableBuildCheck) {
         args.add("--disable-build-check");

Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@ protected List<String> createArgs() {`
`281`	`281`	`args.add(String.format("--log-level=%s", logLevel));`
`282`	`282`	`}`
`283`	`283`	`if (allowedListIps != null) {`
`284`		`- args.add(String.format("--whitelisted-ips=%s", allowedListIps));`
	`284`	`+ args.add(String.format("--allowed-ips=%s", allowedListIps));`
`285`	`285`	`}`
`286`	`286`	`if (disableBuildCheck) {`
`287`	`287`	`args.add("--disable-build-check");`