[java] Moving new AbstractDriverOptions class to a more appropriate p…

…ackage
SeleniumHQ · Feb 17, 2019 · b6a841f · b6a841f
1 parent c185cca
commit b6a841f
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 42 deletions.
diff --git a/java/client/src/org/openqa/selenium/chrome/ChromeOptions.java b/java/client/src/org/openqa/selenium/chrome/ChromeOptions.java
@@ -19,21 +19,13 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
-import static org.openqa.selenium.remote.CapabilityType.ACCEPT_INSECURE_CERTS;
-import static org.openqa.selenium.remote.CapabilityType.PAGE_LOAD_STRATEGY;
-import static org.openqa.selenium.remote.CapabilityType.UNEXPECTED_ALERT_BEHAVIOUR;
-import static org.openqa.selenium.remote.CapabilityType.UNHANDLED_PROMPT_BEHAVIOUR;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.io.Files;
 
-import org.openqa.selenium.AbstractDriverOptions;
+import org.openqa.selenium.remote.AbstractDriverOptions;
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.MutableCapabilities;
-import org.openqa.selenium.PageLoadStrategy;
-import org.openqa.selenium.Proxy;
 import org.openqa.selenium.SessionNotCreatedException;
-import org.openqa.selenium.UnexpectedAlertBehaviour;
 import org.openqa.selenium.remote.BrowserType;
 import org.openqa.selenium.remote.CapabilityType;
 

diff --git a/java/client/src/org/openqa/selenium/edge/EdgeOptions.java b/java/client/src/org/openqa/selenium/edge/EdgeOptions.java
@@ -17,17 +17,11 @@
 
 package org.openqa.selenium.edge;
 
-import static org.openqa.selenium.remote.CapabilityType.PAGE_LOAD_STRATEGY;
-
-import org.openqa.selenium.AbstractDriverOptions;
+import org.openqa.selenium.remote.AbstractDriverOptions;
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.MutableCapabilities;
-import org.openqa.selenium.Proxy;
 import org.openqa.selenium.remote.BrowserType;
 import org.openqa.selenium.remote.CapabilityType;
 
-import java.util.Objects;
-
 
 /**
  * Class to manage options specific to {@link EdgeDriver}.

diff --git a/java/client/src/org/openqa/selenium/firefox/FirefoxOptions.java b/java/client/src/org/openqa/selenium/firefox/FirefoxOptions.java
@@ -21,21 +21,13 @@
 import static org.openqa.selenium.firefox.FirefoxDriver.BINARY;
 import static org.openqa.selenium.firefox.FirefoxDriver.MARIONETTE;
 import static org.openqa.selenium.firefox.FirefoxDriver.PROFILE;
-import static org.openqa.selenium.remote.CapabilityType.ACCEPT_INSECURE_CERTS;
-import static org.openqa.selenium.remote.CapabilityType.PAGE_LOAD_STRATEGY;
-import static org.openqa.selenium.remote.CapabilityType.STRICT_FILE_INTERACTABILITY;
-import static org.openqa.selenium.remote.CapabilityType.UNHANDLED_PROMPT_BEHAVIOUR;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSortedMap;
 
-import org.openqa.selenium.AbstractDriverOptions;
+import org.openqa.selenium.remote.AbstractDriverOptions;
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.MutableCapabilities;
-import org.openqa.selenium.PageLoadStrategy;
-import org.openqa.selenium.Proxy;
-import org.openqa.selenium.UnexpectedAlertBehaviour;
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.remote.BrowserType;
 import org.openqa.selenium.remote.CapabilityType;

diff --git a/java/client/src/org/openqa/selenium/ie/InternetExplorerOptions.java b/java/client/src/org/openqa/selenium/ie/InternetExplorerOptions.java
@@ -30,23 +30,16 @@
 import static org.openqa.selenium.ie.InternetExplorerDriver.NATIVE_EVENTS;
 import static org.openqa.selenium.ie.InternetExplorerDriver.REQUIRE_WINDOW_FOCUS;
 import static org.openqa.selenium.remote.CapabilityType.BROWSER_NAME;
-import static org.openqa.selenium.remote.CapabilityType.PAGE_LOAD_STRATEGY;
-import static org.openqa.selenium.remote.CapabilityType.UNHANDLED_PROMPT_BEHAVIOUR;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSortedSet;
 import com.google.common.collect.Streams;
 
-import org.openqa.selenium.AbstractDriverOptions;
+import org.openqa.selenium.remote.AbstractDriverOptions;
 import org.openqa.selenium.Beta;
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.MutableCapabilities;
-import org.openqa.selenium.PageLoadStrategy;
-import org.openqa.selenium.Proxy;
-import org.openqa.selenium.UnexpectedAlertBehaviour;
 import org.openqa.selenium.remote.BrowserType;
-import org.openqa.selenium.remote.CapabilityType;
 
 import java.time.Duration;
 import java.util.Arrays;

diff --git a/java/client/src/org/openqa/selenium/opera/OperaOptions.java b/java/client/src/org/openqa/selenium/opera/OperaOptions.java
@@ -25,12 +25,9 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.io.Files;
 
-import org.openqa.selenium.AbstractDriverOptions;
+import org.openqa.selenium.remote.AbstractDriverOptions;
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.MutableCapabilities;
-import org.openqa.selenium.Proxy;
 import org.openqa.selenium.WebDriverException;
-import org.openqa.selenium.remote.CapabilityType;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/...penqa/selenium/AbstractDriverOptions.java → ...elenium/remote/AbstractDriverOptions.java b/...penqa/selenium/AbstractDriverOptions.java → ...elenium/remote/AbstractDriverOptions.java
@@ -15,14 +15,19 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.openqa.selenium;
+package org.openqa.selenium.remote;
 
 import static org.openqa.selenium.remote.CapabilityType.ACCEPT_INSECURE_CERTS;
 import static org.openqa.selenium.remote.CapabilityType.PAGE_LOAD_STRATEGY;
 import static org.openqa.selenium.remote.CapabilityType.PROXY;
 import static org.openqa.selenium.remote.CapabilityType.UNEXPECTED_ALERT_BEHAVIOUR;
 import static org.openqa.selenium.remote.CapabilityType.UNHANDLED_PROMPT_BEHAVIOUR;
 
+import org.openqa.selenium.MutableCapabilities;
+import org.openqa.selenium.PageLoadStrategy;
+import org.openqa.selenium.Proxy;
+import org.openqa.selenium.UnexpectedAlertBehaviour;
+
 import java.util.Objects;
 
 public class AbstractDriverOptions<DO extends AbstractDriverOptions> extends MutableCapabilities {

diff --git a/java/client/src/org/openqa/selenium/remote/BUCK b/java/client/src/org/openqa/selenium/remote/BUCK
@@ -74,6 +74,7 @@ java_library(
 java_library(
     name = "remote-lib",
     srcs = [
+        "AbstractDriverOptions.java",
         "AcceptedW3CCapabilityKeys.java",
         "CommandCodec.java",
         "CommandInfo.java",

diff --git a/java/client/src/org/openqa/selenium/safari/SafariOptions.java b/java/client/src/org/openqa/selenium/safari/SafariOptions.java
@@ -21,12 +21,9 @@
 
 import com.google.common.collect.ImmutableSortedMap;
 
-import org.openqa.selenium.AbstractDriverOptions;
+import org.openqa.selenium.remote.AbstractDriverOptions;
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.MutableCapabilities;
-import org.openqa.selenium.Proxy;
 import org.openqa.selenium.WebDriverException;
-import org.openqa.selenium.remote.CapabilityType;
 
 import java.util.Map;
 import java.util.TreeMap;