From cad83c7f6ba4876a9f999b8f93cb92192d5ebbfe Mon Sep 17 00:00:00 2001 From: Alexei Barantsev Date: Sat, 16 Dec 2017 23:30:11 +0300 Subject: [PATCH] Deleting deprecated code --- .../org/openqa/selenium/remote/server/BUCK | 1 - .../remote/server/DefaultDriverFactory.java | 13 +-- .../remote/server/DefaultDriverProvider.java | 18 ---- .../remote/server/DriverProvider.java | 9 -- .../remote/server/FirefoxDriverProvider.java | 99 ------------------- .../server/ActiveSessionFactoryTest.java | 5 - .../remote/server/DriverFactoryTest.java | 5 +- 7 files changed, 2 insertions(+), 148 deletions(-) delete mode 100644 java/server/src/org/openqa/selenium/remote/server/FirefoxDriverProvider.java diff --git a/java/server/src/org/openqa/selenium/remote/server/BUCK b/java/server/src/org/openqa/selenium/remote/server/BUCK index 4b7e7cbd9d81d..7d8be6f8cac6f 100644 --- 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 index 786a23c252ca3..d6397ee1271e7 100644 --- 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 index 45d892f16bcb8..424280360b0e5 100644 --- 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 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 index b4642f83cdbae..0c2b0ecb41d49 100644 --- 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 deleted file mode 100644 index af8d320055e15..0000000000000 --- a/java/server/src/org/openqa/selenium/remote/server/FirefoxDriverProvider.java +++ /dev/null @@ -1,99 +0,0 @@ -// Licensed to the Software Freedom Conservancy (SFC) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The SFC licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. -package org.openqa.selenium.remote.server; - -import org.openqa.selenium.Capabilities; -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebDriverException; -import org.openqa.selenium.remote.BrowserType; -import org.openqa.selenium.remote.DesiredCapabilities; - -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; -import java.util.logging.Logger; - -/** - * This driver provider that instantiates FirefoxDriver. - * @deprecated No longer used. - */ -@Deprecated -public class FirefoxDriverProvider implements DriverProvider { - - private static final Logger LOG = Logger.getLogger(FirefoxDriverProvider.class.getName()); - - @Override - public Capabilities getProvidedCapabilities() { - return DesiredCapabilities.firefox(); - } - - /** - * Checks that driver class can be loaded. - */ - @Override - public boolean canCreateDriverInstances() { - return true; - } - - /** - * Checks that the browser name set in the provided capabilities matches the browser name - * set in the desired capabilities. - * @param capabilities The desired capabilities - * @return true if the browser name is the same, false otherwise - */ - @Override - public boolean canCreateDriverInstanceFor(Capabilities capabilities) { - return BrowserType.FIREFOX.equals(capabilities.getBrowserName()); - } - - @Override - public WebDriver newInstance(Capabilities capabilities) { - LOG.info("Creating a new session for " + capabilities); - return callConstructor("org.openqa.selenium.firefox.FirefoxDriver", capabilities); - } - - private Class getDriverClass(String driverClassName) { - try { - return Class.forName(driverClassName).asSubclass(WebDriver.class); - } catch (ClassNotFoundException | NoClassDefFoundError e) { - throw new WebDriverException("Driver class not found: " + driverClassName); - } catch (UnsupportedClassVersionError e) { - throw new WebDriverException( - "Driver class is built for higher Java version: " + driverClassName); - } - } - - private WebDriver callConstructor(String driverClassName, Capabilities capabilities) { - Class from = getDriverClass(driverClassName); - try { - Constructor constructor = from.getConstructor(Capabilities.class); - return constructor.newInstance(capabilities); - } catch (NoSuchMethodException e) { - try { - return from.newInstance(); - } catch (InstantiationException | IllegalAccessException e1) { - throw new WebDriverException(e); - } - } catch (InvocationTargetException | InstantiationException | IllegalAccessException e) { - throw new WebDriverException(e); - } - } - - @Override - public String toString() { - return "Firefox/Marionette driver"; - } -} diff --git a/java/server/test/org/openqa/selenium/remote/server/ActiveSessionFactoryTest.java b/java/server/test/org/openqa/selenium/remote/server/ActiveSessionFactoryTest.java index 42f7673e1b701..b61bb54a73456 100644 --- 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 index a88c7f77c7739..a68576003d98c 100644 --- 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; }