Skip to content

Commit e41da15

Browse files
committed
Less guava, more Java 8
1 parent a1451a1 commit e41da15

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

java/client/src/org/openqa/selenium/firefox/internal/NewProfileExtensionConnection.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717

1818
package org.openqa.selenium.firefox.internal;
1919

20-
import com.google.common.base.Optional;
20+
import static org.openqa.selenium.firefox.FirefoxProfile.PORT_PREFERENCE;
21+
import static org.openqa.selenium.internal.SocketLock.DEFAULT_PORT;
2122

2223
import org.openqa.selenium.WebDriverException;
2324
import org.openqa.selenium.firefox.ExtensionConnection;
@@ -26,14 +27,14 @@
2627
import org.openqa.selenium.firefox.FirefoxProfile;
2728
import org.openqa.selenium.firefox.NotConnectedException;
2829
import org.openqa.selenium.internal.Lock;
30+
import org.openqa.selenium.io.CircularOutputStream;
2931
import org.openqa.selenium.io.MultiOutputStream;
3032
import org.openqa.selenium.logging.LocalLogs;
3133
import org.openqa.selenium.logging.NeedsLocalLogs;
3234
import org.openqa.selenium.net.NetworkUtils;
3335
import org.openqa.selenium.remote.Command;
3436
import org.openqa.selenium.remote.HttpCommandExecutor;
3537
import org.openqa.selenium.remote.Response;
36-
import org.openqa.selenium.io.CircularOutputStream;
3738

3839
import java.io.File;
3940
import java.io.FileOutputStream;
@@ -44,9 +45,7 @@
4445
import java.net.URI;
4546
import java.net.URISyntaxException;
4647
import java.net.URL;
47-
48-
import static org.openqa.selenium.firefox.FirefoxProfile.PORT_PREFERENCE;
49-
import static org.openqa.selenium.internal.SocketLock.DEFAULT_PORT;
48+
import java.util.Optional;
5049

5150
public class NewProfileExtensionConnection implements ExtensionConnection, NeedsLocalLogs {
5251

@@ -139,16 +138,16 @@ protected void addWebDriverExtensionIfNeeded() {
139138
if (profile.containsWebDriverExtension()) {
140139
return;
141140
}
142-
profile.addExtension("webdriver", loadCustomExtension().or(loadDefaultExtension()));
141+
profile.addExtension("webdriver", loadCustomExtension().orElse(loadDefaultExtension()));
143142
}
144143

145144
private static Optional<Extension> loadCustomExtension() {
146145
String xpiProperty = System.getProperty(FirefoxDriver.SystemProperty.DRIVER_XPI_PROPERTY);
147146
if (xpiProperty != null) {
148147
File xpi = new File(xpiProperty);
149-
return Optional.of((Extension) new FileExtension(xpi));
148+
return Optional.of(new FileExtension(xpi));
150149
}
151-
return Optional.absent();
150+
return Optional.empty();
152151
}
153152

154153
private static Extension loadDefaultExtension() {

0 commit comments

Comments
 (0)