[java] Fixing Java 8 compatibility issues

Author: barancev

java/client/test/org/openqa/selenium/ProxySettingTest.java

@@ -53,6 +53,7 @@
 import java.util.Map;
 
 import static java.nio.charset.StandardCharsets.US_ASCII;
+import static java.util.Collections.singletonMap;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.openqa.selenium.remote.CapabilityType.PROXY;
 import static org.openqa.selenium.testing.drivers.Browser.CHROME;
@@ -183,7 +184,8 @@ private Server<?> createPacfileServer(final String pacFileContents) {
 
   private Server<?> createServer(HttpHandler handler) {
     Server<?> server = new JreServer(
-      new BaseServerOptions(new MapConfig(Map.of("server", Map.of("port", PortProber.findFreePort())))),
+      new BaseServerOptions(new MapConfig(
+        singletonMap("server", singletonMap("port", PortProber.findFreePort())))),
       handler)
       .start();
 

java/client/test/org/openqa/selenium/ReferrerTest.java

@@ -48,6 +48,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.stream.Collectors;
 
 import static com.google.common.net.HttpHeaders.REFERER;
 import static java.nio.charset.StandardCharsets.US_ASCII;
@@ -106,9 +107,9 @@ public class ReferrerTest {
 
   @BeforeClass
   public static void readContents() throws IOException {
-    page1 = Files.readString(locate("common/src/web/proxy" + PAGE_1));
-    page2 = Files.readString(locate("common/src/web/proxy" + PAGE_2));
-    page3 = Files.readString(locate("common/src/web/proxy/page3.html"));
+    page1 = new String(Files.readAllBytes(locate("common/src/web/proxy" + PAGE_1)));
+    page2 = new String(Files.readAllBytes(locate("common/src/web/proxy" + PAGE_2)));
+    page3 = new String(Files.readAllBytes(locate("common/src/web/proxy/page3.html")));
   }
 
   @Before
@@ -412,7 +413,7 @@ public HttpResponse execute(HttpRequest req) throws UncheckedIOException {
     }
 
     public List<ExpectedRequest> getRequests() {
-      return List.copyOf(requests);
+      return requests.stream().collect(Collectors.toList());
     }
   }
 

java/client/test/org/openqa/selenium/environment/webserver/NettyAppServer.java

@@ -51,7 +51,8 @@
 
 public class NettyAppServer implements AppServer {
 
-  private static Config sslConfig = new MapConfig(Map.of("server", Map.of("https-self-signed", true)));
+  private static Config sslConfig = new MapConfig(
+    singletonMap("server", singletonMap("https-self-signed", true)));
 
   private final Server<?> server;
   private final Server<?> secure;
@@ -95,9 +96,8 @@ private NettyAppServer(Config config, HttpHandler handler) {
   }
 
   private static Config createDefaultConfig() {
-    return new MemoizedConfig(
-      new MapConfig(Map.of("server", Map.of(
-        "port", PortProber.findFreePort()))));
+    return new MemoizedConfig(new MapConfig(
+      singletonMap("server", singletonMap("port", PortProber.findFreePort()))));
   }
 
   @Override