Add an HttpClient backed by OkHttp

Author: shs96c

.idea/libraries/okhttp.xml

@@ -41,5 +41,7 @@
 	<classpathentry kind="lib" path="/third-party/java/github/org.eclipse.egit.github.core-2.1.5.jar" sourcepath="/third-party/java/github/org.eclipse.egit.github.core-2.1.5.jar-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/bytebuddy/byte-buddy-1.7.9.jar" sourcepath="/third-party/java/bytebuddy/byte-buddy-1.7.9-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/javaparser/javaparser-core-3.5.7.jar" sourcepath="/third-party/java/javaparser/javaparser-core-3.5.7-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/okhttp3/okhttp-3.9.1.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/okio/okio-1.13.0.jar"/>
 	<classpathentry kind="output" path="build/production"/>
 </classpath>

java/client/.classpath

@@ -42,6 +42,7 @@
     <orderEntry type="library" scope="TEST" name="websocket" level="project" />
     <orderEntry type="library" scope="TEST" name="github" level="project" />
     <orderEntry type="library" name="javaparser" level="project" />
+    <orderEntry type="library" name="okhttp" level="project" />
   </component>
   <component name="sonarModuleSettings">
     <option name="alternativeWorkingDirPath" value="" />

java/client/client.iml

@@ -123,6 +123,7 @@ java_library(name = 'remote-lib',
     'internal/ApacheHttpClient.java',
     'internal/HttpClientFactory.java',
     'internal/JreHttpClient.java',
+    'internal/OkHttpClient.java',
     'internal/JsonToWebElementConverter.java',
     'internal/WebElementToJsonConverter.java',
     'mobile/RemoteNetworkConnection.java',
@@ -139,6 +140,7 @@ java_library(name = 'remote-lib',
     '//java/client/src/org/openqa/selenium/json:json',
     '//java/client/src/org/openqa/selenium/remote/session:session',
     '//third_party/java/httpcomponents:httpclient',
+    '//third_party/java/okhttp3:okhttp',
   ],
   deps = [
     ':http-session-id',

java/client/src/org/openqa/selenium/remote/BUCK

@@ -78,7 +78,7 @@ public Iterable<String> getHeaders(String name) {
   public String getHeader(String name) {
     return headers.entries().stream()
         .filter(e -> Objects.nonNull(e.getKey()))
-        .filter(e -> e.getKey().toLowerCase().equals(name.toLowerCase()))
+        .filter(e -> e.getKey().equalsIgnoreCase(name.toLowerCase()))
         .map(Map.Entry::getValue)
         .findFirst()
         .orElse(null);

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

@@ -0,0 +1,112 @@
+// Licensed to the Software Freedom Conservancy (SFC) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The SFC licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.openqa.selenium.remote.internal;
+
+import org.openqa.selenium.remote.http.HttpClient;
+import org.openqa.selenium.remote.http.HttpRequest;
+import org.openqa.selenium.remote.http.HttpResponse;
+
+import okhttp3.ConnectionPool;
+import okhttp3.MediaType;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Optional;
+
+public class OkHttpClient implements HttpClient {
+
+  private final okhttp3.OkHttpClient client;
+  private final URL baseUrl;
+
+  public OkHttpClient(okhttp3.OkHttpClient client, URL url) {
+    this.client = client;
+    this.baseUrl = url;
+  }
+
+  @Override
+  public HttpResponse execute(HttpRequest request, boolean followRedirects) throws IOException {
+    if (followRedirects != client.followRedirects()) {
+      throw new IllegalArgumentException("Unable to change how the http client follows redirets");
+    }
+
+    Request.Builder builder = new Request.Builder();
+
+    builder.url(new URL(baseUrl.toString() + request.getUri()));
+
+    for (String name : request.getHeaderNames()) {
+      for (String value : request.getHeaders(name)) {
+        builder.addHeader(name, value);
+      }
+    }
+
+    switch (request.getMethod()) {
+      case GET:
+        builder.get();
+        break;
+
+      case POST:
+        String rawType = Optional.of(request.getHeader("Content-Type"))
+            .orElse("application/json; charset=utf-8");
+        MediaType type = MediaType.parse(rawType);
+        RequestBody body = RequestBody.create(type, request.getContent());
+        builder.post(body);
+        break;
+
+      case DELETE:
+        builder.delete();
+    }
+
+    Response response = client.newCall(builder.build()).execute();
+
+    HttpResponse toReturn = new HttpResponse();
+    toReturn.setContent(response.body().bytes());
+    toReturn.setStatus(response.code());
+    response.headers().names().forEach(
+        name -> response.headers(name).forEach(value -> toReturn.addHeader(name, value)));
+
+    return toReturn;
+  }
+
+  @Override
+  public void close() {
+    // No-op
+  }
+
+  public static class Factory implements HttpClient.Factory {
+
+    private ConnectionPool pool = new ConnectionPool();
+
+    @Override
+    public HttpClient createClient(URL url) {
+      okhttp3.OkHttpClient client = new okhttp3.OkHttpClient.Builder()
+          .connectionPool(pool)
+          .followRedirects(true)
+          .followSslRedirects(true)
+          .build();
+      return new OkHttpClient(client, url);
+    }
+
+    @Override
+    public void cleanupIdleClients() {
+      pool.evictAll();
+    }
+  }
+}

java/client/src/org/openqa/selenium/remote/internal/OkHttpClient.java

@@ -72,8 +72,8 @@ public void responseShouldKeepMultipleHeadersSeparate() throws Exception {
 
     ImmutableList<String> values = ImmutableList.copyOf(response.getHeaders("Cheese"));
 
-    assertTrue(values.contains("Cheddar"));
-    assertTrue(values.contains("Brie, Gouda"));
+    assertTrue(values.toString(), values.contains("Cheddar"));
+    assertTrue(values.toString(), values.contains("Brie, Gouda"));
   }
 
   private HttpResponse getResponseWithHeaders(final Multimap<String, String> headers)

java/client/test/org/openqa/selenium/remote/internal/HttpClientTestBase.java

@@ -0,0 +1,11 @@
+package org.openqa.selenium.remote.internal;
+
+import org.openqa.selenium.remote.http.HttpClient;
+
+public class OkHttpClientTest extends HttpClientTestBase {
+
+  @Override
+  protected HttpClient.Factory createFactory() {
+    return new OkHttpClient.Factory();
+  }
+}

java/client/test/org/openqa/selenium/remote/internal/OkHttpClientTest.java

@@ -0,0 +1,13 @@
+prebuilt_jar(
+  name = 'okhttp',
+  maven_coords = 'com.squareup.okhttp3:okhttp:jar:3.9.1',
+  binary_jar = 'okhttp-3.9.1.jar',
+  source_jar = 'okhttp-3.9.1-sources.jar',
+  deps = [
+    '//third_party/java/okio:okio'
+  ],
+  visibility = [
+    '//java/client/src/org/openqa/selenium/remote:remote-lib',
+  ],
+)
+