Merge pull request #189 from launchdarkly/eb/62055/http-upgrade

(5.0) finish updating to okhttp 4.x

Author: eli-darkly

build.gradle

@@ -59,7 +59,7 @@ ext.libraries = [:]
 libraries.internal = [
     "commons-codec:commons-codec:1.10",
     "com.google.guava:guava:28.2-jre",
-    "com.launchdarkly:okhttp-eventsource:2.0.0",
+    "com.launchdarkly:okhttp-eventsource:2.0.1",
     "org.yaml:snakeyaml:1.19",
     "redis.clients:jedis:2.9.0"
 ]
@@ -73,7 +73,8 @@ libraries.external = [
 
 // Add dependencies to "libraries.test" that are used only in unit tests.
 libraries.test = [
-    "com.squareup.okhttp3:mockwebserver:3.10.0",
+    "com.squareup.okhttp3:mockwebserver:4.3.1",
+    "com.squareup.okhttp3:okhttp-tls:4.3.1",
     "org.hamcrest:hamcrest-all:1.3",
     "org.easymock:easymock:3.4",
     "junit:junit:4.12",

packaging-test/test-app/src/main/java/testapp/TestApp.java

@@ -14,10 +14,6 @@ public static void main(String[] args) throws Exception {
       System.out.println("*** error: RedisDataStoreBuilder.DEFAULT_URI is " + RedisDataStoreBuilder.DEFAULT_URI);
       System.exit(1);
     }
-    if (!RedisFeatureStoreBuilder.DEFAULT_URI.toString().equals("redis://localhost:6379")) {
-      System.out.println("*** error: RedisFeatureStoreBuilder.DEFAULT_URI is " + RedisFeatureStoreBuilder.DEFAULT_URI);
-      System.exit(1);
-    }
 
     LDConfig config = new LDConfig.Builder()
       .offline(true)

src/main/java/com/launchdarkly/client/DefaultEventProcessor.java

@@ -47,6 +47,7 @@ final class DefaultEventProcessor implements EventProcessor {
   private static final String EVENT_SCHEMA_HEADER = "X-LaunchDarkly-Event-Schema";
   private static final String EVENT_SCHEMA_VERSION = "3";
   private static final String EVENT_PAYLOAD_ID_HEADER = "X-LaunchDarkly-Payload-ID";
+  private static final MediaType JSON_CONTENT_TYPE = MediaType.parse("application/json; charset=utf-8");
 
   @VisibleForTesting final EventDispatcher dispatcher;
   private final BlockingQueue<EventProcessorMessage> inbox;
@@ -485,7 +486,7 @@ private static void postJson(OkHttpClient httpClient, Headers headers, String js
 
       Request request = new Request.Builder()
           .url(uriStr)
-          .post(RequestBody.create(MediaType.parse("application/json; charset=utf-8"), json))
+          .post(RequestBody.create(json, JSON_CONTENT_TYPE))
           .headers(headers)
           .build();
 

src/test/java/com/launchdarkly/client/DefaultEventProcessorTest.java

@@ -846,7 +846,7 @@ public void httpClientCanUseCustomTlsConfig() throws Exception {
     try (TestHttpUtil.ServerWithCert serverWithCert = httpsServerWithSelfSignedCert(eventsSuccessResponse())) {
       EventProcessorBuilder ec = sendEvents().baseURI(serverWithCert.uri());
       LDConfig config = new LDConfig.Builder()
-          .sslSocketFactory(serverWithCert.sslClient.socketFactory, serverWithCert.sslClient.trustManager) // allows us to trust the self-signed cert
+          .sslSocketFactory(serverWithCert.socketFactory, serverWithCert.trustManager) // allows us to trust the self-signed cert
           .build();
 
       try (DefaultEventProcessor ep = makeEventProcessor(ec, config)) {

src/test/java/com/launchdarkly/client/FeatureRequestorTest.java

@@ -178,7 +178,7 @@ public void httpClientCanUseCustomTlsConfig() throws Exception {
 
     try (TestHttpUtil.ServerWithCert serverWithCert = httpsServerWithSelfSignedCert(resp)) {
       LDConfig config = new LDConfig.Builder()
-          .sslSocketFactory(serverWithCert.sslClient.socketFactory, serverWithCert.sslClient.trustManager) // allows us to trust the self-signed cert
+          .sslSocketFactory(serverWithCert.socketFactory, serverWithCert.trustManager) // allows us to trust the self-signed cert
           .build();
 
       try (DefaultFeatureRequestor r = makeRequestor(serverWithCert.server, config)) {

src/test/java/com/launchdarkly/client/LDClientEndToEndTest.java

@@ -71,7 +71,7 @@ public void clientStartsInPollingModeWithSelfSignedCert() throws Exception {
       LDConfig config = new LDConfig.Builder()
           .dataSource(basePollingConfig(serverWithCert.server))
           .events(noEvents())
-          .sslSocketFactory(serverWithCert.sslClient.socketFactory, serverWithCert.sslClient.trustManager) // allows us to trust the self-signed cert
+          .sslSocketFactory(serverWithCert.socketFactory, serverWithCert.trustManager) // allows us to trust the self-signed cert
           .build();
 
       try (LDClient client = new LDClient(sdkKey, config)) {
@@ -127,7 +127,7 @@ public void clientStartsInStreamingModeWithSelfSignedCert() throws Exception {
       LDConfig config = new LDConfig.Builder()
           .dataSource(baseStreamingConfig(serverWithCert.server))
           .events(noEvents())
-          .sslSocketFactory(serverWithCert.sslClient.socketFactory, serverWithCert.sslClient.trustManager) // allows us to trust the self-signed cert
+          .sslSocketFactory(serverWithCert.socketFactory, serverWithCert.trustManager) // allows us to trust the self-signed cert
           .build();
 
       try (LDClient client = new LDClient(sdkKey, config)) {

src/test/java/com/launchdarkly/client/StreamProcessorTest.java

@@ -439,7 +439,7 @@ public void httpClientCanUseCustomTlsConfig() throws Exception {
       server.server.enqueue(eventStreamResponse(STREAM_RESPONSE_WITH_EMPTY_DATA));
 
       LDConfig config = new LDConfig.Builder()
-          .sslSocketFactory(server.sslClient.socketFactory, server.sslClient.trustManager) // allows us to trust the self-signed cert
+          .sslSocketFactory(server.socketFactory, server.trustManager) // allows us to trust the self-signed cert
           .build();
 
       try (StreamProcessor sp = createStreamProcessorWithRealHttp(config, server.uri())) {

src/test/java/com/launchdarkly/client/TestHttpUtil.java

@@ -5,14 +5,19 @@
 
 import java.io.Closeable;
 import java.io.IOException;
+import java.math.BigInteger;
 import java.net.InetAddress;
 import java.net.URI;
 import java.security.GeneralSecurityException;
 
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.X509TrustManager;
+
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
-import okhttp3.mockwebserver.internal.tls.HeldCertificate;
-import okhttp3.mockwebserver.internal.tls.SslClient;
+import okhttp3.tls.HandshakeCertificates;
+import okhttp3.tls.HeldCertificate;
+import okhttp3.tls.internal.TlsUtil;
 
 class TestHttpUtil {
   static MockWebServer makeStartedServer(MockResponse... responses) throws IOException {
@@ -56,25 +61,25 @@ static MockResponse eventStreamResponse(String data) {
   static class ServerWithCert implements Closeable {
     final MockWebServer server;
     final HeldCertificate cert;
-    final SslClient sslClient;
+    final SSLSocketFactory socketFactory;
+    final X509TrustManager trustManager;
 
     public ServerWithCert() throws IOException, GeneralSecurityException {
       String hostname = InetAddress.getByName("localhost").getCanonicalHostName();
 
       cert = new HeldCertificate.Builder()
-        .serialNumber("1")
-        .ca(1)
+        .serialNumber(BigInteger.ONE)
+        .certificateAuthority(1)
         .commonName(hostname)
-        .subjectAlternativeName(hostname)
+        .addSubjectAlternativeName(hostname)
         .build();
 
-      sslClient = new SslClient.Builder()
-          .certificateChain(cert.keyPair, cert.certificate)
-          .addTrustedCertificate(cert.certificate)
-          .build();
+      HandshakeCertificates hc = TlsUtil.localhost();
+      socketFactory = hc.sslSocketFactory();
+      trustManager = hc.trustManager();
 
       server = new MockWebServer();
-      server.useHttps(sslClient.socketFactory, false);
+      server.useHttps(socketFactory, false);
     }
 
     public URI uri() {