Bump to OkHttp 4.X (#2709)

Author: bmarcaur

build.gradle

@@ -67,12 +67,6 @@ allprojects {
                 version { strictly '2.4.0' }
                 because 'Retrofit 2.5.0 breaks with our path parameter routing logic'
             }
-
-            rootConfiguration 'com.squareup.okhttp3:okhttp', {
-                version { strictly '[3, 3.14.0[' }
-                because 'okhttp 3.14.0 removed UnrepeatableRequestBody which is relied on by an internal library'
-            }
-
         }
     }
 }

changelog/@unreleased/pr-2709.v2.yml

@@ -0,0 +1,5 @@
+type: improvement
+improvement:
+  description: Bump to OkHttp 4.X
+  links:
+  - https://github.com/palantir/conjure-java-runtime/pull/2709

okhttp-clients/src/main/java/com/palantir/conjure/java/okhttp/ForwardingOkHttpClient.java

@@ -292,7 +292,7 @@ private static RemotingOkHttpClient createInternal(
                 .addMetrics("from", DispatcherMetricSet.class.getSimpleName(), dispatcherMetricSet);
 
         return new RemotingOkHttpClient(
-                client.build(),
+                client,
                 backoffStrategyFunction,
                 config.nodeSelectionStrategy(),
                 urlSelector,

okhttp-clients/src/main/java/com/palantir/conjure/java/okhttp/OkHttpClients.java

@@ -32,8 +32,6 @@
  */
 package com.palantir.conjure.java.okhttp;
 
-import static okhttp3.internal.Util.verifyAsIpAddress;
-
 import java.security.cert.Certificate;
 import java.security.cert.CertificateParsingException;
 import java.security.cert.X509Certificate;
@@ -46,6 +44,7 @@
 import javax.net.ssl.SSLException;
 import javax.net.ssl.SSLSession;
 import javax.security.auth.x500.X500Principal;
+import okhttp3.internal.Util;
 
 /**
  * A HostnameVerifier consistent with <a href="http://www.ietf.org/rfc/rfc2818.txt">RFC 2818</a>.
@@ -79,7 +78,7 @@ public boolean verify(String host, SSLSession session) {
     }
 
     public boolean verify(String host, X509Certificate certificate) {
-        return verifyAsIpAddress(host) ? verifyIpAddress(host, certificate) : verifyHostname(host, certificate);
+        return Util.canParseAsIpAddress(host) ? verifyIpAddress(host, certificate) : verifyHostname(host, certificate);
     }
 
     /** Returns true if {@code certificate} matches {@code ipAddress}. */

okhttp-clients/src/main/java/com/palantir/conjure/java/okhttp/Okhttp39HostnameVerifier.java

@@ -51,7 +51,6 @@
 import okhttp3.Request;
 import okhttp3.Response;
 import okhttp3.ResponseBody;
-import okhttp3.internal.http.UnrepeatableRequestBody;
 
 /**
  * An OkHttp {@link Call} implementation that handles standard retryable error status such as 308, 429, 503, and
@@ -586,7 +585,7 @@ private static void retryIfAllowed(Callback callback, Call call, Exception excep
     }
 
     private static boolean isStreamingBody(Call call) {
-        return call.request().body() instanceof UnrepeatableRequestBody;
+        return call.request().body() != null && call.request().body().isOneShot();
     }
 
     private static boolean shouldPropagateQos(ClientConfiguration.ServerQoS serverQoS) {

okhttp-clients/src/main/java/com/palantir/conjure/java/okhttp/RemotingOkHttpCall.java

@@ -37,7 +37,7 @@
  * An {@link OkHttpClient} that executes {@link okhttp3.Call}s as {@link RemotingOkHttpCall}s in order to retry a class
  * of retryable error states.
  */
-final class RemotingOkHttpClient extends ForwardingOkHttpClient {
+final class RemotingOkHttpClient extends OkHttpClient {
     private static final SafeLogger log = SafeLoggerFactory.get(RemotingOkHttpClient.class);
 
     private static final int MAX_NUM_RELOCATIONS = 20;
@@ -53,7 +53,7 @@ final class RemotingOkHttpClient extends ForwardingOkHttpClient {
     private final ClientConfiguration.RetryOnSocketException retryOnSocketException;
 
     RemotingOkHttpClient(
-            OkHttpClient delegate,
+            OkHttpClient.Builder builder,
             Supplier<BackoffStrategy> backoffStrategy,
             NodeSelectionStrategy nodeSelectionStrategy,
             UrlSelector urls,
@@ -63,7 +63,7 @@ final class RemotingOkHttpClient extends ForwardingOkHttpClient {
             ClientConfiguration.ServerQoS serverQoS,
             ClientConfiguration.RetryOnTimeout retryOnTimeout,
             ClientConfiguration.RetryOnSocketException retryOnSocketException) {
-        super(delegate);
+        super(builder);
         this.backoffStrategyFactory = backoffStrategy;
         this.nodeSelectionStrategy = nodeSelectionStrategy;
         this.urls = urls;
@@ -93,7 +93,7 @@ public Builder newBuilder() {
     RemotingOkHttpCall newCallWithMutableState(
             Request request, BackoffStrategy backoffStrategy, int maxNumRelocations, Optional<Call> previousCall) {
         return new RemotingOkHttpCall(
-                getDelegate().newCall(request),
+                super.newCall(request),
                 previousCall,
                 backoffStrategy,
                 urls,

okhttp-clients/src/main/java/com/palantir/conjure/java/okhttp/RemotingOkHttpClient.java

@@ -65,7 +65,6 @@
 import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
-import okhttp3.internal.http.UnrepeatableRequestBody;
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
 import okhttp3.mockwebserver.SocketPolicy;
@@ -176,7 +175,7 @@ public void streamingRequestBodyIsNotRetried() throws IOException {
         assertThat(body.retried).hasValue(0);
     }
 
-    private static final class StreamingRequestBody extends RequestBody implements UnrepeatableRequestBody {
+    private static final class StreamingRequestBody extends RequestBody {
         private static final MediaType OCTET_STREAM = MediaType.parse("application/octet-stream");
 
         private final Source source;
@@ -203,6 +202,11 @@ public void writeTo(BufferedSink sink) throws IOException {
                 }
             }
         }
+
+        @Override
+        public boolean isOneShot() {
+            return true;
+        }
     }
 
     private static final class StreamReusedException extends IOException {

okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/OkHttpClientsTest.java

@@ -52,8 +52,9 @@ com.palantir.tritium:tritium-api:0.79.0 (2 constraints: 411f78be)
 com.palantir.tritium:tritium-core:0.79.0 (1 constraints: 48105fa2)
 com.palantir.tritium:tritium-metrics:0.79.0 (5 constraints: 1b4de163)
 com.palantir.tritium:tritium-registry:0.79.0 (6 constraints: 625dbee1)
-com.squareup.okhttp3:okhttp:3.13.1 (4 constraints: 2e38ea61)
-com.squareup.okio:okio:1.17.2 (1 constraints: 850cc309)
+com.squareup.okhttp3:okhttp:4.12.0 (3 constraints: 292d9bf6)
+com.squareup.okio:okio:3.6.0 (1 constraints: 530c38fd)
+com.squareup.okio:okio-jvm:3.6.0 (1 constraints: 500ad3b9)
 com.squareup.retrofit2:converter-jackson:2.4.0 (1 constraints: 08050136)
 com.squareup.retrofit2:retrofit:2.4.0 (2 constraints: 4b1d8704)
 com.thoughtworks.paranamer:paranamer:2.8 (1 constraints: 7b15b5d4)
@@ -87,7 +88,11 @@ org.immutables:value:2.10.0 (1 constraints: 35052f3b)
 org.javassist:javassist:3.29.2-GA (1 constraints: 30112ef1)
 org.jboss.logging:jboss-logging:3.5.0.Final (4 constraints: 0747c0c6)
 org.jboss.threads:jboss-threads:3.5.0.Final (3 constraints: b52a2fe5)
-org.jetbrains:annotations:24.0.1 (2 constraints: fc20bc6d)
+org.jetbrains:annotations:24.0.1 (3 constraints: da2fbd33)
+org.jetbrains.kotlin:kotlin-stdlib:1.9.10 (2 constraints: c2210fe1)
+org.jetbrains.kotlin:kotlin-stdlib-common:1.9.10 (2 constraints: 3f1b4b83)
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10 (1 constraints: e210ffd2)
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10 (3 constraints: eb27efa7)
 org.jvnet:animal-sniffer-annotation:1.0 (1 constraints: f20b95eb)
 org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir:1.1.3 (1 constraints: 0d10f991)
 org.scala-lang:scala-library:2.12.17 (1 constraints: 3c16782c)
@@ -98,13 +103,13 @@ org.wildfly.common:wildfly-common:1.5.4.Final (2 constraints: 741cfbf1)
 com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.3 (1 constraints: 3905393b)
 com.google.code.findbugs:annotations:3.0.1 (1 constraints: 9e0aafc3)
 com.palantir.safe-logging:preconditions-assertj:3.6.0 (1 constraints: 0b050c36)
-com.squareup.okhttp3:mockwebserver:3.13.1 (1 constraints: 3a053f3b)
+com.squareup.okhttp3:mockwebserver:4.12.0 (1 constraints: 3905413b)
 io.leangen.geantyref:geantyref:1.3.4 (1 constraints: 0a05fd35)
 io.reactivex.rxjava2:rxjava:2.2.21 (1 constraints: 3905363b)
 io.undertow:undertow-core:2.2.24.Final (2 constraints: a619e9ea)
 io.undertow:undertow-servlet-jakarta:2.2.20.Final (1 constraints: 50071361)
 jakarta.servlet:jakarta.servlet-api:5.0.0 (2 constraints: 1015bdac)
-junit:junit:4.12 (1 constraints: 080f065e)
+junit:junit:4.13.2 (1 constraints: 690fa77c)
 net.bytebuddy:byte-buddy:1.14.8 (2 constraints: c416aa4f)
 net.bytebuddy:byte-buddy-agent:1.14.8 (1 constraints: 480b46de)
 net.jcip:jcip-annotations:1.0 (1 constraints: 560ff165)

versions.lock

@@ -13,6 +13,7 @@ com.palantir.safe-logging:* = 3.6.0
 com.palantir.tokens:* = 3.18.0
 com.palantir.tracing:* = 6.18.0
 com.palantir.tritium:* = 0.79.0
+com.squareup.okhttp3:* = 4.12.0
 io.reactivex.rxjava2:rxjava = 2.2.21
 org.apache.commons:commons-lang3 = 3.13.0
 org.assertj:assertj-core = 3.24.2
@@ -50,9 +51,6 @@ javax.inject:javax.inject = 1
 
 com.fasterxml.jackson.*:* = 2.13.1
 
-# Temporarily pausing until internal libraries stop relying on UnrepeatableRequestBody
-com.squareup.okhttp3:* = 3.13.1
-
 # We cannot upgrade retrofit2 to 2.5.0 because of https://github.com/palantir/conjure-java-runtime/issues/930
 com.squareup.retrofit2:* = 2.4.0