Deleting deprecated (in 3.6) methods

Author: barancev

java/client/src/org/openqa/selenium/MutableCapabilities.java

@@ -17,7 +17,6 @@
 
 package org.openqa.selenium;
 
-
 import java.io.Serializable;
 import java.util.Collections;
 import java.util.HashSet;

java/client/src/org/openqa/selenium/chrome/ChromeOptions.java

@@ -254,19 +254,6 @@ public ChromeOptions setProxy(Proxy proxy) {
     return this;
   }
 
-  /**
-   * Returns DesiredCapabilities for Chrome with these options included as
-   * capabilities. This does not copy the options. Further changes will be
-   * reflected in the returned capabilities.
-   *
-   * @return DesiredCapabilities for Chrome with these options.
-   * @deprecated This class is already an instance of {@link MutableCapabilities}.
-   */
-  @Deprecated
-  MutableCapabilities toCapabilities() {
-    return this;
-  }
-
   @Override
   protected int amendHashCode() {
     return Objects.hash(

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

@@ -71,15 +71,4 @@ public EdgeOptions setProxy(Proxy proxy) {
     setCapability(CapabilityType.PROXY, proxy);
     return this;
   }
-
-  /**
-   * Returns DesiredCapabilities for Edge with these options included as capabilities. This does not
-   * copy the options. Further changes will be reflected in the returned capabilities.
-   *
-   * @return DesiredCapabilities for Edge with these options.
-   * @deprecated These are already {@link MutableCapabilities}.
-   */
-  MutableCapabilities toCapabilities() {
-    return this;
-  }
 }

java/client/src/org/openqa/selenium/firefox/FirefoxOptions.java

@@ -38,7 +38,6 @@
 import org.openqa.selenium.firefox.internal.ProfilesIni;
 import org.openqa.selenium.remote.BrowserType;
 import org.openqa.selenium.remote.CapabilityType;
-import org.openqa.selenium.remote.DesiredCapabilities;
 
 import java.io.File;
 import java.io.IOException;
@@ -381,37 +380,12 @@ public Map<String, Object> asMap() {
     return toReturn;
   }
 
-  /**
-   * @deprecated Use {@link #merge(Capabilities)}.
-   */
-  @Deprecated
-  public FirefoxOptions addCapabilities(Capabilities capabilities) {
-    merge(capabilities);
-    return this;
-  }
-
   @Override
   public FirefoxOptions merge(Capabilities capabilities) {
     super.merge(capabilities);
     return this;
   }
 
-  /**
-   * @deprecated No replacement. We are already {@link Capabilities}.
-   */
-  @Deprecated
-  public Capabilities toCapabilities() {
-    return this;
-  }
-
-  /**
-   * @deprecated Use {@link MutableCapabilities#merge(Capabilities)}.
-   */
-  @Deprecated
-  public DesiredCapabilities addTo(DesiredCapabilities capabilities) {
-    return capabilities.merge(this);
-  }
-
   @Override
   protected int amendHashCode() {
     return Objects.hash(

java/client/src/org/openqa/selenium/safari/SafariOptions.java

@@ -186,19 +186,6 @@ private static SafariOptions fromJsonMap(Map<?, ?> options)  {
     return safariOptions;
   }
 
-  /**
-   * Returns DesiredCapabilities for Safari with these options included as
-   * capabilities. This does not copy the object. Further changes will be
-   * reflected in the returned capabilities.
-   *
-   * @return DesiredCapabilities for Safari with these extensions.
-   * @deprecated {@code SafariOptions} are already {@link MutableCapabilities}.
-   */
-  @Deprecated
-  MutableCapabilities toCapabilities() {
-    return this;
-  }
-
   @Override
   protected int amendHashCode() {
     return options.hashCode();