Skip to content

Commit d4dba1c

Browse files
committed
[java] Removing XpiDriverService and XpiDriverInfo
Also, removing associated tests This has been deprecated for a while.
1 parent e98d4ee commit d4dba1c

File tree

9 files changed

+57
-765
lines changed

9 files changed

+57
-765
lines changed

‎java/spotbugs-excludes.xml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<FindBugsFilter
3-
xmlns="https://github.com/spotbugs/filter/3.0.0"
43
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xmlns="https://github.com/spotbugs/filter/3.0.0"
55
xsi:schemaLocation="https://github.com/spotbugs/filter/3.0.0 https://raw.githubusercontent.com/spotbugs/spotbugs/3.1.0/spotbugs/etc/findbugsfilter.xsd">
66

77
<Match>
@@ -63,11 +63,6 @@
6363
<Bug pattern="RV_RETURN_VALUE_IGNORED_BAD_PRACTICE"/>
6464
</Match>
6565

66-
<Match>
67-
<Class name="org.openqa.selenium.firefox.xpi.XpiDriverService"/>
68-
<Bug pattern="OBL_UNSATISFIED_OBLIGATION"/>
69-
</Match>
70-
7166
<Match>
7267
<Class name="~org.openqa.selenium.grid.commands.CompletionCommand.*"/>
7368
<Bug pattern="DM_EXIT"/>

‎java/src/org/openqa/selenium/firefox/FirefoxDriver.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,15 +162,10 @@ public static RemoteWebDriverBuilder builder() {
162162
private static FirefoxDriverCommandExecutor toExecutor(FirefoxOptions options) {
163163
Require.nonNull("Options to construct executor from", options);
164164

165-
String sysProperty = System.getProperty(SystemProperty.DRIVER_USE_MARIONETTE);
166-
boolean isLegacy = (sysProperty != null && !Boolean.parseBoolean(sysProperty))
167-
|| options.isLegacy();
168-
169165
FirefoxDriverService.Builder<?, ?> builder =
170166
StreamSupport.stream(ServiceLoader.load(DriverService.Builder.class).spliterator(), false)
171167
.filter(b -> b instanceof FirefoxDriverService.Builder)
172168
.map(FirefoxDriverService.Builder.class::cast)
173-
.filter(b -> b.isLegacy() == isLegacy)
174169
.findFirst().orElseThrow(WebDriverException::new);
175170

176171
return new FirefoxDriverCommandExecutor(builder.withOptions(options).build());

‎java/src/org/openqa/selenium/firefox/xpi/BUILD.bazel

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎java/src/org/openqa/selenium/firefox/xpi/XpiDriverInfo.java

Lines changed: 0 additions & 91 deletions
This file was deleted.

0 commit comments

Comments
 (0)