Merge branch 'trunk' into bidi_add_authentication_handler

Author: aguspe

java/src/org/openqa/selenium/netty/server/NettyServer.java

@@ -27,6 +27,7 @@
 import io.netty.handler.ssl.SslContext;
 import io.netty.handler.ssl.SslContextBuilder;
 import io.netty.handler.ssl.util.SelfSignedCertificate;
+import io.netty.util.concurrent.Future;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 import io.netty.util.internal.logging.JdkLoggerFactory;
 import java.io.IOException;
@@ -127,8 +128,11 @@ public URL getUrl() {
   @Override
   public void stop() {
     try {
-      bossGroup.shutdownGracefully().sync();
-      workerGroup.shutdownGracefully().sync();
+      Future<?> bossShutdown = bossGroup.shutdownGracefully();
+      Future<?> workerShutdown = workerGroup.shutdownGracefully();
+
+      bossShutdown.sync();
+      workerShutdown.sync();
 
       channel.closeFuture().sync();
     } catch (InterruptedException e) {

java/src/org/openqa/selenium/remote/http/HttpMessage.java

@@ -29,11 +29,9 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 import java.util.function.BiConsumer;
 import java.util.function.Supplier;
-import java.util.stream.Collectors;
 import org.openqa.selenium.internal.Require;
 
 abstract class HttpMessage<M extends HttpMessage<M>> {
@@ -92,11 +90,8 @@ public Iterable<String> getHeaderNames() {
    * @return an iterable view of the values
    */
   public Iterable<String> getHeaders(String name) {
-    return headers.entrySet().stream()
-        .filter(e -> Objects.nonNull(e.getKey()))
-        .filter(e -> e.getKey().equalsIgnoreCase(name.toLowerCase()))
-        .flatMap((e) -> e.getValue().stream())
-        .collect(Collectors.toList());
+    return Collections.unmodifiableCollection(
+        headers.getOrDefault(name.toLowerCase(), Collections.emptyList()));
   }
 
   /**
@@ -106,12 +101,8 @@ public Iterable<String> getHeaders(String name) {
    * @return the value
    */
   public String getHeader(String name) {
-    return headers.entrySet().stream()
-        .filter(e -> Objects.nonNull(e.getKey()))
-        .filter(e -> e.getKey().equalsIgnoreCase(name.toLowerCase()))
-        .flatMap((e) -> e.getValue().stream())
-        .findFirst()
-        .orElse(null);
+    List<String> values = headers.getOrDefault(name.toLowerCase(), Collections.emptyList());
+    return !values.isEmpty() ? values.get(0) : null;
   }
 
   /**
@@ -146,7 +137,7 @@ public M addHeader(String name, String value) {
    * @return self
    */
   public M removeHeader(String name) {
-    headers.keySet().removeIf(header -> header.equalsIgnoreCase(name));
+    headers.remove(name.toLowerCase());
     return self();
   }