Deprecating EdgeDriver constructors that accept Capabilities, it's recommended to use EdgeOptions

Author: barancev

java/client/src/org/openqa/selenium/edge/EdgeDriver.java

@@ -113,7 +113,9 @@ public EdgeDriver(EdgeDriverService service) {
 	   *
 	   * @param capabilities The capabilities required from the EdgeDriver.
 	   * @see #EdgeDriver(EdgeDriverService, Capabilities)
+     * @deprecated Use {@link EdgeDriver(EdgeOptions)}
 	   */
+	  @Deprecated
 	  public EdgeDriver(Capabilities capabilities) {
 	    this(EdgeDriverService.createDefaultService(), capabilities);
 	  }
@@ -136,7 +138,7 @@ public EdgeDriver(EdgeOptions options) {
 	   * @param options The options to use.
 	   */
 	  public EdgeDriver(EdgeDriverService service, EdgeOptions options) {
-	    this(service, options.toCapabilities());
+      super(new DriverCommandExecutor(service), options);
 	  }
 
 	  /**
@@ -145,7 +147,9 @@ public EdgeDriver(EdgeDriverService service, EdgeOptions options) {
 	   *
 	   * @param service The service to use.
 	   * @param capabilities The capabilities required from the EdgeDriver.
+     * @deprecated Use {@link EdgeDriver(EdgeDriverService, EdgeOptions)}
 	   */
+		@Deprecated
 	  public EdgeDriver(EdgeDriverService service, Capabilities capabilities) {
 	    super(new DriverCommandExecutor(service), capabilities);
 	  }

java/client/src/org/openqa/selenium/edge/EdgeOptions.java

@@ -19,12 +19,15 @@
 
 import static org.openqa.selenium.remote.CapabilityType.PAGE_LOAD_STRATEGY;
 
+import com.google.common.collect.ImmutableMap;
+
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.MutableCapabilities;
 import org.openqa.selenium.Platform;
 import org.openqa.selenium.remote.BrowserType;
 import org.openqa.selenium.remote.CapabilityType;
 
+import java.util.Map;
 import java.util.Objects;
 
 
@@ -77,4 +80,9 @@ public void setPageLoadStrategy(String strategy) {
   MutableCapabilities toCapabilities() {
     return this;
   }
+
+  @Override
+  public Map<String, ?> asMap() {
+    return ImmutableMap.of(CAPABILITY, super.asMap());
+  }
 }