[grid] Java 8 language level fixes, closes #8860

SeleniumHQ · Nov 10, 2020 · 203a0fe · 203a0fe
1 parent 09db963
commit 203a0fe
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/java/client/src/org/openqa/selenium/firefox/FirefoxProfile.java b/java/client/src/org/openqa/selenium/firefox/FirefoxProfile.java
@@ -27,11 +27,13 @@
 import org.openqa.selenium.json.Json;
 
 import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
 import java.io.Reader;
 import java.io.StringReader;
+import java.io.Writer;
 import java.net.URL;
 import java.nio.charset.Charset;
 import java.util.HashMap;
@@ -248,7 +250,8 @@ public void updateUserPrefs(File userPrefs) {
       prefs.setPreference("browser.startup.page", 1);
     }
 
-    try (FileWriter writer = new FileWriter(userPrefs, Charset.defaultCharset())) {
+    try (Writer writer = new OutputStreamWriter(
+      new FileOutputStream(userPrefs), Charset.defaultCharset())) {
       prefs.writeTo(writer);
     } catch (IOException e) {
       throw new WebDriverException(e);

diff --git a/java/server/src/org/openqa/selenium/grid/config/DescribedOption.java b/java/server/src/org/openqa/selenium/grid/config/DescribedOption.java
@@ -125,7 +125,7 @@ public String example(Config config) {
     Optional<List<String>> allOptions = config.getAll(section, optionName);
     if (allOptions.isPresent() && !allOptions.get().isEmpty()) {
       if (repeats) {
-        return allOptions.stream()
+        return allOptions.get().stream()
           .map(value -> quotable ? "\"" + value + "\"" : String.valueOf(value))
           .collect(Collectors.joining(", ", "[", "]"));
       }

diff --git a/java/server/src/org/openqa/selenium/grid/data/NodeStatus.java b/java/server/src/org/openqa/selenium/grid/data/NodeStatus.java
@@ -64,11 +64,14 @@ public boolean hasCapability(Capabilities caps) {
   }
 
   public boolean hasCapacity() {
-    return slots.stream().anyMatch(slot -> slot.getSession().isEmpty());
+
+    return slots.stream().anyMatch(slot -> !slot.getSession().isPresent());
   }
 
   public boolean hasCapacity(Capabilities caps) {
-    return slots.stream().anyMatch(slot -> slot.getSession().isEmpty() && slot.isSupporting(caps));
+
+    return slots.stream()
+      .anyMatch(slot -> !slot.getSession().isPresent() && slot.isSupporting(caps));
   }
 
   public NodeId getId() {

diff --git a/java/server/src/org/openqa/selenium/grid/docker/DockerOptions.java b/java/server/src/org/openqa/selenium/grid/docker/DockerOptions.java
@@ -95,7 +95,7 @@ private URI getDockerUri() {
   }
 
   private boolean isEnabled(HttpClient.Factory clientFactory) {
-    if (config.getAll(DOCKER_SECTION, "configs").isEmpty()) {
+    if (!config.getAll(DOCKER_SECTION, "configs").isPresent()) {
       return false;
     }
 

diff --git a/java/server/src/org/openqa/selenium/grid/docker/DockerSessionFactory.java b/java/server/src/org/openqa/selenium/grid/docker/DockerSessionFactory.java
@@ -271,7 +271,7 @@ private TimeZone getTimeZone(Capabilities sessionRequestCapabilities) {
   private Dimension getScreenResolution(Capabilities sessionRequestCapabilities) {
     Optional<Object> screenResolution =
       ofNullable(getCapability(sessionRequestCapabilities, "screenResolution"));
-    if (screenResolution.isEmpty()) {
+    if (!screenResolution.isPresent()) {
       return null;
     }
     try {