Deleting deprecated code

odedniv · Dec 16, 2017 · cad83c7 · cad83c7
1 parent 289227f
commit cad83c7
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 148 deletions.
diff --git a/java/server/src/org/openqa/selenium/remote/server/BUCK b/java/server/src/org/openqa/selenium/remote/server/BUCK
@@ -27,7 +27,6 @@ java_library(name = 'server',
     'DriverFactory.java',
     'DriverProvider.java',
     'DriverServlet.java',
-    'FirefoxDriverProvider.java',
     'InputStreamWrappingServletInputStream.java',
     'JsonHttpCommandHandler.java',
     'JsonParametersAware.java',

diff --git a/java/server/src/org/openqa/selenium/remote/server/DefaultDriverFactory.java b/java/server/src/org/openqa/selenium/remote/server/DefaultDriverFactory.java
@@ -76,11 +76,7 @@ public DefaultDriverFactory(Platform runningOn) {
   }
 
   public void registerDriverProvider(DriverProvider driverProvider) {
-    if (driverProvider.canCreateDriverInstances()) {
-      capabilitiesToDriverProvider.put(driverProvider.getProvidedCapabilities(), driverProvider);
-    } else {
-      LOG.info(String.format("Driver provider %s is not registered", driverProvider));
-    }
+    capabilitiesToDriverProvider.put(driverProvider.getProvidedCapabilities(), driverProvider);
   }
 
   @VisibleForTesting
@@ -129,13 +125,6 @@ private void registerDriverProvider(Platform current, DriverProvider provider) {
       return;
     }
 
-    if (!provider.canCreateDriverInstances()) {
-      LOG.info(String.format(
-          "Driver provider %s registration is skipped:%n" +
-          "Unable to create new instances on this machine.",
-          provider));
-    }
-
     registerDriverProvider(provider);
   }
 

diff --git a/java/server/src/org/openqa/selenium/remote/server/DefaultDriverProvider.java b/java/server/src/org/openqa/selenium/remote/server/DefaultDriverProvider.java
@@ -41,14 +41,6 @@ public DefaultDriverProvider(Capabilities capabilities, Class<? extends WebDrive
     this.driverClass = driverClass;
   }
 
-  /**
-   * @deprecated Replace with a call to {@link #createProvider(Capabilities, String)}
-   */
-  @Deprecated
-  public DefaultDriverProvider(Capabilities capabilities, String driverClassName) {
-    this(capabilities, getDriverClass(driverClassName));
-  }
-
   public static DriverProvider createProvider(Capabilities capabilities, String driverClassName) {
     Class<? extends WebDriver> driverClass = getDriverClass(driverClassName);
     if (driverClass == null) {
@@ -62,16 +54,6 @@ public Capabilities getProvidedCapabilities() {
     return capabilities;
   }
 
-  /**
-   * Checks that driver class can be loaded.
-   * @deprecated All providers should be able to create driver classes.
-   */
-  @Override
-  @Deprecated
-  public boolean canCreateDriverInstances() {
-    return driverClass != null;
-  }
-
   /**
    * Checks that the browser name set in the provided capabilities matches the browser name
    * set in the desired capabilities.

diff --git a/java/server/src/org/openqa/selenium/remote/server/DriverProvider.java b/java/server/src/org/openqa/selenium/remote/server/DriverProvider.java
@@ -44,15 +44,6 @@ public interface DriverProvider {
    */
   Capabilities getProvidedCapabilities();
 
-  /**
-   * Checks if the provider can create driver instances "in general".
-   *
-   * @return true if the provider can create driver instances.
-   * @deprecated All providers should be able to create driver instances.
-   */
-  @Deprecated
-  boolean canCreateDriverInstances();
-
   /**
    * Checks if the provider can create driver instance with the desired capabilities.
    *

diff --git a/java/server/src/org/openqa/selenium/remote/server/FirefoxDriverProvider.java b/java/server/src/org/openqa/selenium/remote/server/FirefoxDriverProvider.java
diff --git a/java/server/test/org/openqa/selenium/remote/server/ActiveSessionFactoryTest.java b/java/server/test/org/openqa/selenium/remote/server/ActiveSessionFactoryTest.java
@@ -82,11 +82,6 @@ public Capabilities getProvidedCapabilities() {
       return caps;
     }
 
-    @Override
-    public boolean canCreateDriverInstances() {
-      return true;
-    }
-
     @Override
     public boolean canCreateDriverInstanceFor(Capabilities capabilities) {
       return this.caps.getBrowserName().equals(capabilities.getBrowserName());

diff --git a/java/server/test/org/openqa/selenium/remote/server/DriverFactoryTest.java b/java/server/test/org/openqa/selenium/remote/server/DriverFactoryTest.java
@@ -25,16 +25,14 @@
 
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.Platform;
 import org.openqa.selenium.StubDriver;
 import org.openqa.selenium.remote.BrowserType;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
-@RunWith(JUnit4.class)
 public class DriverFactoryTest {
+
   private DefaultDriverFactory factory;
 
   @Before
@@ -209,7 +207,6 @@ public Capabilities getCapabilities() {
   private DriverProvider mockDriverProviderFor(Capabilities nojavascript) {
     DriverProvider nojavascriptProvider = mock(DriverProvider.class);
     when(nojavascriptProvider.getProvidedCapabilities()).thenReturn(nojavascript);
-    when(nojavascriptProvider.canCreateDriverInstances()).thenReturn(true);
     return nojavascriptProvider;
   }