Fix problem with query parameters in the NettyServer and switch from the JreAppServer for NettyAppServer

Author: shs96c

java/client/test/org/openqa/selenium/devtools/CdpFacadeTest.java

@@ -24,7 +24,7 @@
 import org.openqa.selenium.HasAuthentication;
 import org.openqa.selenium.UsernameAndPassword;
 import org.openqa.selenium.environment.webserver.BasicAuthHandler;
-import org.openqa.selenium.environment.webserver.JreAppServer;
+import org.openqa.selenium.environment.webserver.NettyAppServer;
 import org.openqa.selenium.remote.http.HttpResponse;
 import org.openqa.selenium.remote.http.Route;
 import org.openqa.selenium.support.devtools.NetworkInterceptor;
@@ -36,11 +36,11 @@
 
 public class CdpFacadeTest extends DevToolsTestBase {
 
-  private static JreAppServer server;
+  private static NettyAppServer server;
 
   @BeforeClass
   public static void startServer() {
-    server = new JreAppServer(new BasicAuthHandler());
+    server = new NettyAppServer(new BasicAuthHandler());
     server.start();
   }
 

java/client/test/org/openqa/selenium/environment/BUILD.bazel

@@ -53,7 +53,7 @@ java_library(
         "//java/server/src/org/openqa/selenium/grid/config",
         "//java/server/src/org/openqa/selenium/grid/server",
         "//java/server/src/org/openqa/selenium/grid/web",
-        "//java/server/src/org/openqa/selenium/jre/server",
+        "//java/server/src/org/openqa/selenium/netty/server",
         artifact("com.google.guava:guava"),
         artifact("org.eclipse.jetty:jetty-http"),
         artifact("org.eclipse.jetty:jetty-server"),

java/client/test/org/openqa/selenium/environment/webserver/JreAppServer.java renamed to java/client/test/org/openqa/selenium/environment/webserver/NettyAppServer.java

@@ -24,9 +24,9 @@
 import org.openqa.selenium.grid.web.PathResource;
 import org.openqa.selenium.grid.web.ResourceHandler;
 import org.openqa.selenium.internal.Require;
-import org.openqa.selenium.jre.server.JreServer;
 import org.openqa.selenium.json.Json;
 import org.openqa.selenium.net.PortProber;
+import org.openqa.selenium.netty.server.NettyServer;
 import org.openqa.selenium.remote.http.HttpClient;
 import org.openqa.selenium.remote.http.HttpHandler;
 import org.openqa.selenium.remote.http.HttpMethod;
@@ -51,19 +51,19 @@
 import static org.openqa.selenium.remote.http.Route.matching;
 import static org.openqa.selenium.remote.http.Route.post;
 
-public class JreAppServer implements AppServer {
+public class NettyAppServer implements AppServer {
 
   private final Server<?> server;
 
-  public JreAppServer() {
+  public NettyAppServer() {
     this(emulateJettyAppServer());
   }
 
-  public JreAppServer(HttpHandler handler) {
+  public NettyAppServer(HttpHandler handler) {
     Require.nonNull("Handler", handler);
 
     int port = PortProber.findFreePort();
-    server = new JreServer(
+    server = new NettyServer(
       new BaseServerOptions(new MapConfig(singletonMap("server", singletonMap("port", port)))),
       handler);
   }
@@ -162,7 +162,7 @@ public String getAlternateHostName() {
   }
 
   public static void main(String[] args) {
-    JreAppServer server = new JreAppServer();
+    NettyAppServer server = new NettyAppServer();
     server.start();
 
     System.out.println(server.whereIs("/"));

java/client/test/org/openqa/selenium/environment/webserver/JreAppServerTest.java renamed to java/client/test/org/openqa/selenium/environment/webserver/NettyAppServerTest.java

@@ -17,10 +17,10 @@
 
 package org.openqa.selenium.environment.webserver;
 
-public class JreAppServerTest extends AppServerTestBase {
+public class NettyAppServerTest extends AppServerTestBase {
 
   @Override
   protected AppServer createAppServer() {
-    return new JreAppServer();
+    return new NettyAppServer();
   }
 }

java/client/test/org/openqa/selenium/net/UrlCheckerTest.java

@@ -19,7 +19,7 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.openqa.selenium.environment.webserver.JreAppServer;
+import org.openqa.selenium.environment.webserver.NettyAppServer;
 import org.openqa.selenium.remote.http.HttpResponse;
 
 import java.net.MalformedURLException;
@@ -36,12 +36,12 @@ public class UrlCheckerTest {
 
   private final UrlChecker urlChecker = new UrlChecker();
   private final ExecutorService executorService = Executors.newSingleThreadExecutor();
-  private JreAppServer server;
+  private NettyAppServer server;
   private URL url;
 
   @Before
   public void buildServer() throws MalformedURLException {
-    JreAppServer server = new JreAppServer(req -> new HttpResponse()
+    NettyAppServer server = new NettyAppServer(req -> new HttpResponse()
       .setStatus(200)
       .setContent(utf8String("<h1>Working</h1>")));
     this.server = server;

java/client/test/org/openqa/selenium/support/devtools/NetworkInterceptorTest.java

@@ -24,7 +24,7 @@
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.devtools.HasDevTools;
-import org.openqa.selenium.environment.webserver.JreAppServer;
+import org.openqa.selenium.environment.webserver.NettyAppServer;
 import org.openqa.selenium.remote.http.Contents;
 import org.openqa.selenium.remote.http.HttpResponse;
 import org.openqa.selenium.remote.http.Route;
@@ -40,13 +40,13 @@
 
 public class NetworkInterceptorTest {
 
-  private JreAppServer appServer;
+  private NettyAppServer appServer;
   private WebDriver driver;
   private NetworkInterceptor interceptor;
 
   @Before
   public void setup() {
-    appServer = new JreAppServer(req -> new HttpResponse()
+    appServer = new NettyAppServer(req -> new HttpResponse()
         .setStatus(200)
         .addHeader("Content-Type", MediaType.XHTML_UTF_8.toString())
         .setContent(utf8String("<html><head><title>Hello, World!</title></head><body/></html>")));

java/server/src/org/openqa/selenium/netty/server/BUILD.bazel

@@ -5,6 +5,7 @@ java_library(
     name = "server",
     srcs = glob(["*.java"]),
     visibility = [
+        "//java/client/test/org/openqa/selenium:__subpackages__",
         "//java/server/src/org/openqa/selenium/grid:__subpackages__",
         "//java/server/src/org/openqa/selenium/netty/server:__pkg__",
         "//java/server/src/org/openqa/selenium/remote/server:__pkg__",

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

@@ -29,6 +29,7 @@
 import io.netty.handler.codec.http.HttpUtil;
 import io.netty.handler.codec.http.HttpVersion;
 import io.netty.handler.codec.http.LastHttpContent;
+import io.netty.handler.codec.http.QueryStringDecoder;
 import io.netty.util.ReferenceCountUtil;
 import org.openqa.selenium.remote.http.HttpMethod;
 import org.openqa.selenium.remote.http.HttpRequest;
@@ -126,10 +127,13 @@ private HttpRequest createRequest(
       return null;
     }
 
+    QueryStringDecoder decoder = new QueryStringDecoder(nettyRequest.uri());
 
     HttpRequest req = new HttpRequest(
       method,
-      nettyRequest.uri());
+      decoder.path());
+
+    decoder.parameters().forEach((key, values) -> values.forEach(value -> req.addQueryParameter(key, value)));
 
     nettyRequest.headers().entries().stream()
       .filter(entry -> entry.getKey() != null)