[java] Removing deprecated SUPPORTS_JAVASCRIPT cap

diemol · diemol · commit 1b600b166335 · 2023-05-18T15:20:04.000+02:00
diff --git a/java/src/org/openqa/selenium/remote/CapabilityType.java b/java/src/org/openqa/selenium/remote/CapabilityType.java
@@ -20,11 +20,6 @@
 /** Commonly seen remote webdriver capabilities. */
 public interface CapabilityType {
 
-  /**
-   * @deprecated Non W3C compliant
-   */
-  @Deprecated String SUPPORTS_JAVASCRIPT = "javascriptEnabled";
-
   String BROWSER_NAME = "browserName";
   String PLATFORM_NAME = "platformName";
   String BROWSER_VERSION = "browserVersion";
diff --git a/java/src/org/openqa/selenium/remote/DesiredCapabilities.java b/java/src/org/openqa/selenium/remote/DesiredCapabilities.java
@@ -21,7 +21,6 @@
 import static org.openqa.selenium.remote.CapabilityType.BROWSER_NAME;
 import static org.openqa.selenium.remote.CapabilityType.BROWSER_VERSION;
 import static org.openqa.selenium.remote.CapabilityType.PLATFORM_NAME;
-import static org.openqa.selenium.remote.CapabilityType.SUPPORTS_JAVASCRIPT;
 
 import java.util.Map;
 import org.openqa.selenium.Capabilities;
@@ -70,14 +69,6 @@ public void setPlatform(Platform platform) {
     setCapability(PLATFORM_NAME, platform);
   }
 
-  /**
-   * @deprecated This setting has no effect in W3C sessions, and JWP support is going away soon.
-   */
-  @Deprecated
-  public void setJavascriptEnabled(boolean javascriptEnabled) {
-    setCapability(SUPPORTS_JAVASCRIPT, javascriptEnabled);
-  }
-
   public boolean acceptInsecureCerts() {
     if (getCapability(ACCEPT_INSECURE_CERTS) != null) {
       Object raw = getCapability(ACCEPT_INSECURE_CERTS);
diff --git a/java/src/org/openqa/selenium/remote/RemoteWebDriver.java b/java/src/org/openqa/selenium/remote/RemoteWebDriver.java
@@ -21,7 +21,6 @@
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static java.util.logging.Level.SEVERE;
 import static org.openqa.selenium.remote.CapabilityType.PLATFORM_NAME;
-import static org.openqa.selenium.remote.CapabilityType.SUPPORTS_JAVASCRIPT;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -471,12 +470,6 @@ public String getWindowHandle() {
 
   @Override
   public Object executeScript(String script, Object... args) {
-    if (!isJavascriptEnabled()) {
-      throw new UnsupportedOperationException(
-          "You must be using an underlying instance of WebDriver that supports executing"
-              + " javascript");
-    }
-
     List<Object> convertedArgs =
         Stream.of(args).map(new WebElementToJsonConverter()).collect(Collectors.toList());
 
@@ -485,22 +478,12 @@ public Object executeScript(String script, Object... args) {
 
   @Override
   public Object executeAsyncScript(String script, Object... args) {
-    if (!isJavascriptEnabled()) {
-      throw new UnsupportedOperationException(
-          "You must be using an underlying instance of "
-              + "WebDriver that supports executing javascript");
-    }
-
     List<Object> convertedArgs =
         Stream.of(args).map(new WebElementToJsonConverter()).collect(Collectors.toList());
 
     return execute(DriverCommand.EXECUTE_ASYNC_SCRIPT(script, convertedArgs)).getValue();
   }
 
-  private boolean isJavascriptEnabled() {
-    return getCapabilities().is(SUPPORTS_JAVASCRIPT);
-  }
-
   @Override
   public TargetLocator switchTo() {
     return new RemoteTargetLocator();
