server: Deleting deprecated code

onlywade · Jun 8, 2015 · 6418964 · 6418964
1 parent 854e6fa
commit 6418964
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 34 deletions.
diff --git a/java/server/src/org/openqa/selenium/remote/server/DefaultDriverFactory.java b/java/server/src/org/openqa/selenium/remote/server/DefaultDriverFactory.java
@@ -35,11 +35,6 @@ public class DefaultDriverFactory implements DriverFactory {
   private Map<Capabilities, DriverProvider> capabilitiesToDriverProvider =
       new ConcurrentHashMap<Capabilities, DriverProvider>();
 
-  @Deprecated
-  public void registerDriver(Capabilities capabilities, Class<? extends WebDriver> driverClass) {
-    registerDriverProvider(new DefaultDriverProvider(capabilities, driverClass));
-  }
-
   public void registerDriverProvider(DriverProvider driverProvider) {
     if (driverProvider.canCreateDriverInstances()) {
       capabilitiesToDriverProvider.put(driverProvider.getProvidedCapabilities(), driverProvider);

diff --git a/java/server/src/org/openqa/selenium/remote/server/DefaultDriverProvider.java b/java/server/src/org/openqa/selenium/remote/server/DefaultDriverProvider.java
@@ -53,8 +53,7 @@ public boolean canCreateDriverInstances() {
     return getDriverClass() != null;
   }
 
-  @Override
-  public Class<? extends WebDriver> getDriverClass() {
+  private Class<? extends WebDriver> getDriverClass() {
     if (driverClass != null) {
       return driverClass;
     }

diff --git a/java/server/src/org/openqa/selenium/remote/server/DefaultDriverSessions.java b/java/server/src/org/openqa/selenium/remote/server/DefaultDriverSessions.java
@@ -72,20 +72,6 @@ public DefaultDriverSessions(DriverFactory factory) {
     this(Platform.getCurrent(), factory);
   }
 
-  /**
-   * @deprecated Use DefaultDriverSessions(DriverFactory factory) constructor
-   * and register all drivers to the factory
-   */
-  @Deprecated
-  public DefaultDriverSessions(
-      DriverFactory factory, Map<Capabilities, Class<? extends WebDriver>> drivers) {
-    this.factory = factory;
-    for (Map.Entry<Capabilities, Class<? extends WebDriver>> entry : drivers.entrySet()) {
-      registerDriver(entry.getKey(), entry.getValue());
-    }
-    this.clock = new SystemClock();
-  }
-
   protected DefaultDriverSessions(Platform runningOn, DriverFactory factory) {
     this(runningOn, factory, new SystemClock());
   }

diff --git a/java/server/src/org/openqa/selenium/remote/server/DriverFactory.java b/java/server/src/org/openqa/selenium/remote/server/DriverFactory.java
@@ -21,12 +21,6 @@
 
 public interface DriverFactory {
 
-  /**
-   * @deprecated Use registerDriverProvider instead
-   */
-  @Deprecated
-  void registerDriver(Capabilities capabilities, Class<? extends WebDriver> implementation);
-
   void registerDriverProvider(DriverProvider implementation);
 
   WebDriver newInstance(Capabilities 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
@@ -43,13 +43,6 @@ public interface DriverProvider {
    */
   Capabilities getProvidedCapabilities();
 
-  /**
-   * This method was used for testing purposes only and will be removed from the interface soon.
-   * @deprecated
-   */
-  @Deprecated
-  Class<? extends WebDriver> getDriverClass();
-
   /**
    * Checks if the provider can create driver instances.
    *