[java] Adding constructors to EdgeDriver and EdgeHtmlDriver that acce…

…pt a driver service. Fixes issue SeleniumHQ#8306
quehanwei · May 27, 2020 · 373d1fc · 373d1fc
1 parent ea76096
commit 373d1fc
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 17 deletions.
diff --git a/java/client/src/org/openqa/selenium/edge/EdgeDriver.java b/java/client/src/org/openqa/selenium/edge/EdgeDriver.java
@@ -21,7 +21,6 @@
 import org.openqa.selenium.chromium.ChromiumDriver;
 import org.openqa.selenium.chromium.ChromiumDriverCommandExecutor;
 import org.openqa.selenium.internal.Require;
-import org.openqa.selenium.remote.CommandExecutor;
 import org.openqa.selenium.remote.RemoteWebDriver;
 
 
@@ -101,19 +100,19 @@ public class EdgeDriver extends ChromiumDriver {
   public EdgeDriver() { this(new EdgeOptions()); }
 
   public EdgeDriver(EdgeOptions options) {
-    super(toExecutor(options), options, EdgeOptions.CAPABILITY);
+    this(new EdgeDriverService.Builder().build(), options);
   }
 
-  @Deprecated
-  public EdgeDriver(Capabilities capabilities) {
-    super(toExecutor(new EdgeOptions()), capabilities, EdgeOptions.CAPABILITY);
+  public EdgeDriver(EdgeDriverService service) {
+    this(service, new EdgeOptions());
   }
 
-  private static CommandExecutor toExecutor(EdgeOptions options) {
-    Require.nonNull("Driver options", options);
-
-    EdgeDriverService.Builder builder = new EdgeDriverService.Builder();
+  public EdgeDriver(EdgeDriverService service, EdgeOptions options) {
+    super(new ChromiumDriverCommandExecutor("ms", service), Require.nonNull("Driver options", options), EdgeOptions.CAPABILITY);
+  }
 
-    return new ChromiumDriverCommandExecutor("ms", builder.build());
+  @Deprecated
+  public EdgeDriver(Capabilities capabilities) {
+    this(new EdgeDriverService.Builder().build(), new EdgeOptions().merge(capabilities));
   }
 }
diff --git a/java/client/src/org/openqa/selenium/edgehtml/EdgeHtmlDriver.java b/java/client/src/org/openqa/selenium/edgehtml/EdgeHtmlDriver.java
@@ -18,7 +18,6 @@
 
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.internal.Require;
-import org.openqa.selenium.remote.CommandExecutor;
 import org.openqa.selenium.remote.RemoteWebDriver;
 import org.openqa.selenium.remote.service.DriverCommandExecutor;
 
@@ -95,14 +94,14 @@ public class EdgeHtmlDriver extends RemoteWebDriver {
   public EdgeHtmlDriver() { this(new EdgeHtmlOptions()); }
 
   public EdgeHtmlDriver(EdgeHtmlOptions options) {
-    super(toExecutor(options), options);
+    this(new EdgeHtmlDriverService.Builder().build(), options);
   }
 
-  private static CommandExecutor toExecutor(EdgeHtmlOptions options) {
-    Require.nonNull("Driver options", options);
-
-    EdgeHtmlDriverService.Builder builder = new EdgeHtmlDriverService.Builder();
+  public EdgeHtmlDriver(EdgeHtmlDriverService service) {
+    this(service, new EdgeHtmlOptions());
+  }
 
-    return new DriverCommandExecutor(builder.build());
+  public EdgeHtmlDriver(EdgeHtmlDriverService service, EdgeHtmlOptions options) {
+    super(new DriverCommandExecutor(new EdgeHtmlDriverService.Builder().build()), Require.nonNull("Driver options", options));
   }
 }