Make the JreAppServer be based off the JreServer

Author: shs96c

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

@@ -33,6 +33,10 @@ java_library(
         "//java/client/src/org/openqa/selenium/remote",
         "//java/client/src/org/openqa/selenium/remote/http",
         "//java/client/test/org/openqa/selenium/build",
+        "//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",
         artifact("com.google.guava:guava"),
         artifact("org.eclipse.jetty:jetty-http"),
         artifact("org.eclipse.jetty:jetty-server"),
@@ -53,6 +57,18 @@ java_binary(
     ],
 )
 
+java_binary(
+    name = "jre-server",
+    main_class = "org.openqa.selenium.environment.webserver.JreAppServer",
+    visibility = [
+        "//dotnet/test:__subpackages__",
+    ],
+    runtime_deps = [
+        ":environment",
+    ],
+)
+
+
 java_library(
     name = "test-base",
     srcs = ["webserver/AppServerTestBase.java"],

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

@@ -19,11 +19,21 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.io.ByteStreams;
-import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpServer;
+import org.openqa.selenium.grid.config.MapConfig;
+import org.openqa.selenium.grid.server.BaseServerOptions;
+import org.openqa.selenium.grid.server.Server;
+import org.openqa.selenium.grid.web.PathResource;
+import org.openqa.selenium.grid.web.ResourceHandler;
+import org.openqa.selenium.jre.server.JreServer;
 import org.openqa.selenium.json.Json;
 import org.openqa.selenium.net.PortProber;
-import org.openqa.selenium.remote.http.*;
+import org.openqa.selenium.remote.http.HttpClient;
+import org.openqa.selenium.remote.http.HttpHandler;
+import org.openqa.selenium.remote.http.HttpMethod;
+import org.openqa.selenium.remote.http.HttpRequest;
+import org.openqa.selenium.remote.http.HttpResponse;
+import org.openqa.selenium.remote.http.Route;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -33,81 +43,57 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.*;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
+import java.util.Map;
+import java.util.Objects;
 
 import static com.google.common.net.HttpHeaders.CONTENT_TYPE;
 import static com.google.common.net.MediaType.JSON_UTF_8;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.concurrent.TimeUnit.SECONDS;
-import static java.util.stream.Collectors.mapping;
-import static java.util.stream.Collectors.toList;
 import static org.openqa.selenium.build.InProject.locate;
 import static org.openqa.selenium.remote.http.Contents.bytes;
 import static org.openqa.selenium.remote.http.Contents.string;
-import static org.openqa.selenium.remote.http.Route.*;
+import static org.openqa.selenium.remote.http.Route.get;
+import static org.openqa.selenium.remote.http.Route.matching;
+import static org.openqa.selenium.remote.http.Route.post;
 
 public class JreAppServer implements AppServer {
 
-  private final HttpServer server;
-  private HttpHandler handler;
+  private final Server<?> server;
 
   public JreAppServer() {
-    try {
-      int port = PortProber.findFreePort();
-      server = HttpServer.create(new InetSocketAddress(port), 0);
-      server.setExecutor(null);
-      server.createContext(
-          "/", httpExchange -> {
-            HttpRequest req = new SunHttpRequest(httpExchange);
-
-            HttpResponse res = handler.execute(req);
-
-            res.getHeaderNames().forEach(
-              name -> res.getHeaders(name).forEach(value -> httpExchange.getResponseHeaders().add(name, value)));
-            httpExchange.sendResponseHeaders(res.getStatus(), 0);
+    this(emulateJettyAppServer());
+  }
 
-          try (InputStream in = res.getContent().get();
-          OutputStream out = httpExchange.getResponseBody()) {
-            ByteStreams.copy(in, out);
-          }
-        });
+  public JreAppServer(HttpHandler handler) {
+    Objects.requireNonNull(handler, "Handler to use must be set");
 
-      setHandler(emulateJettyAppServer());
-    } catch (IOException e) {
-      throw new UncheckedIOException(e);
-    }
+    int port = PortProber.findFreePort();
+    server = new JreServer(
+      new BaseServerOptions(new MapConfig(Map.of("server", Map.of("port", port)))),
+      handler);
   }
 
-  public Route emulateJettyAppServer() {
+  private static Route emulateJettyAppServer() {
     Path common = locate("common/src/web").toAbsolutePath();
-    System.out.printf("Common is: '%s'\n", common);
 
     return Route.combine(
-      matching(req -> true).to(() -> new StaticContent(path -> Paths.get(common + path), common::resolve)),
+      new ResourceHandler(new PathResource(common)),
       get("/encoding").to(EncodingHandler::new),
       matching(req -> req.getUri().startsWith("/page/")).to(PageHandler::new),
-      get("/redirect").to(() -> new RedirectHandler(whereIs("/"))),
+      get("/redirect").to(() -> new RedirectHandler()),
       get("/sleep").to(SleepingHandler::new),
       post("/upload").to(UploadHandler::new));
   }
 
-  public JreAppServer setHandler(HttpHandler handler) {
-    this.handler = Objects.requireNonNull(handler);
-    return this;
-  }
-
   @Override
   public void start() {
     server.start();
-    PortProber.waitForPortUp(server.getAddress().getPort(), 5, SECONDS);
   }
 
   @Override
   public void stop() {
-    server.stop(0);
+    server.stop();
   }
 
   @Override
@@ -132,7 +118,7 @@ public String whereIsWithCredentials(String relativeUrl, String user, String pas
          user,
          password,
          getHostName(),
-         server.getAddress().getPort(),
+         server.getUrl().getPort(),
          relativeUrl);
   }
 
@@ -145,7 +131,7 @@ private String createUrl(String protocol, String hostName, String relativeUrl) {
       return new URL(
           protocol,
           hostName,
-          server.getAddress().getPort(),
+          server.getUrl().getPort(),
           relativeUrl)
           .toString();
     } catch (MalformedURLException e) {
@@ -181,101 +167,6 @@ public String getAlternateHostName() {
     throw new UnsupportedOperationException("getAlternateHostName");
   }
 
-  private static class SunHttpRequest extends HttpRequest {
-
-    private final HttpExchange exchange;
-
-    public SunHttpRequest(HttpExchange exchange) {
-      super(HttpMethod.valueOf(exchange.getRequestMethod()), exchange.getRequestURI().toString());
-      this.exchange = exchange;
-    }
-
-    @Override
-    public HttpMethod getMethod() {
-      return HttpMethod.valueOf(exchange.getRequestMethod());
-    }
-
-    @Override
-    public String getUri() {
-      return exchange.getRequestURI().getPath();
-    }
-
-    @Override
-    public String getQueryParameter(String name) {
-      String query = exchange.getRequestURI().getQuery();
-      if (query == null) {
-        return null;
-      }
-
-      HashMap<String, List<String>> params = Arrays.stream(query.split("&"))
-          .map(q -> {
-            int i = q.indexOf("=");
-            if (i == -1) {
-              return new AbstractMap.SimpleImmutableEntry<>(q, "");
-            }
-            return new AbstractMap.SimpleImmutableEntry<>(q.substring(0, i), q.substring(i + 1));
-          })
-          .collect(Collectors.groupingBy(
-              Map.Entry::getKey,
-              HashMap::new,
-              mapping(Map.Entry::getValue, toList())));
-
-      List<String> values = params.get(name);
-      if (values == null || values.isEmpty()) {
-        return null;
-      }
-      return values.get(0);
-    }
-
-    @Override
-    public Iterable<String> getHeaderNames() {
-      return exchange.getRequestHeaders().keySet();
-    }
-
-    @Override
-    public Iterable<String> getHeaders(String name) {
-      return exchange.getRequestHeaders().get(name);
-    }
-
-    @Override
-    public Supplier<InputStream> getContent() {
-      return exchange::getRequestBody;
-    }
-  }
-
-  private class SunHttpResponse extends HttpResponse {
-
-    private final HttpExchange exchange;
-
-    public SunHttpResponse(HttpExchange exchange) {
-      this.exchange = exchange;
-    }
-
-    @Override
-    public SunHttpResponse removeHeader(String name) {
-      exchange.getResponseHeaders().remove(name);
-      return this;
-    }
-
-    @Override
-    public SunHttpResponse addHeader(String name, String value) {
-      exchange.getResponseHeaders().add(name, value);
-      return this;
-    }
-
-    @Override
-    public SunHttpResponse setContent(Supplier<InputStream> supplier) {
-      try (OutputStream os = exchange.getResponseBody()) {
-        byte[] bytes = bytes(supplier);
-        exchange.sendResponseHeaders(getStatus(), (long) bytes.length);
-        os.write(bytes);
-      } catch (IOException e) {
-        throw new UncheckedIOException(e);
-      }
-      return this;
-    }
-  }
-
   public static void main(String[] args) {
     JreAppServer server = new JreAppServer();
     server.start();

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

@@ -20,6 +20,7 @@
 import org.openqa.selenium.remote.http.HttpHandler;
 import org.openqa.selenium.remote.http.HttpRequest;
 import org.openqa.selenium.remote.http.HttpResponse;
+import org.openqa.selenium.remote.http.UrlPath;
 
 import java.io.UncheckedIOException;
 
@@ -28,17 +29,13 @@
 
 public class RedirectHandler implements HttpHandler {
 
-  private final String root;
-
-  public RedirectHandler(String root) {
-    this.root = root;
-  }
-
   @Override
   public HttpResponse execute(HttpRequest req) throws UncheckedIOException {
+    String targetLocation = UrlPath.relativeToContext(req, "/resultPage.html");
+
     return new HttpResponse()
       .setStatus(HTTP_MOVED_TEMP)
-      .setHeader("Location", root + "resultPage.html")
+      .setHeader("Location", targetLocation)
       .setContent(utf8String(""));
   }
 }