Skip to content

Commit 01bdab4

Browse files
Upgrade Okie to version 3.6.0 and OkHttp to version 4.12.0
1 parent 3da462f commit 01bdab4

File tree

6 files changed

+701
-7
lines changed

6 files changed

+701
-7
lines changed

pom.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<dep.slice.version>0.38</dep.slice.version>
5050
<dep.testing-mysql-server-5.version>0.6</dep.testing-mysql-server-5.version>
5151
<dep.aws-sdk.version>1.12.560</dep.aws-sdk.version>
52-
<dep.okhttp.version>3.9.0</dep.okhttp.version>
52+
<dep.okhttp.version>4.12.0</dep.okhttp.version>
5353
<dep.jdbi3.version>3.4.0</dep.jdbi3.version>
5454
<dep.oracle.version>19.3.0.0</dep.oracle.version>
5555
<dep.drift.version>1.40</dep.drift.version>
@@ -2528,6 +2528,7 @@
25282528
<exclude>com.fasterxml.jackson.core:jackson-annotations</exclude>
25292529
<exclude>com.fasterxml.jackson.core:jackson-core</exclude>
25302530
<exclude>com.fasterxml.jackson.core:jackson-databind</exclude>
2531+
<exclude>org.jetbrains.kotlin:kotlin-stdlib-jdk8</exclude>
25312532
</excludes>
25322533
</requireUpperBoundDeps>
25332534
</rules>

presto-client/src/main/java/com/facebook/presto/client/JsonResponse.java

-6
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import javax.annotation.Nullable;
2525

2626
import java.io.IOException;
27-
import java.io.InterruptedIOException;
2827
import java.io.UncheckedIOException;
2928

3029
import static com.google.common.base.MoreObjects.toStringHelper;
@@ -146,11 +145,6 @@ public static <T> JsonResponse<T> execute(JsonCodec<T> codec, OkHttpClient clien
146145
return new JsonResponse<>(response.code(), response.message(), response.headers(), body);
147146
}
148147
catch (IOException e) {
149-
// OkHttp throws this after clearing the interrupt status
150-
// TODO: remove after updating to Okio 1.15.0+
151-
if ((e instanceof InterruptedIOException) && "thread interrupted".equals(e.getMessage())) {
152-
Thread.currentThread().interrupt();
153-
}
154148
throw new UncheckedIOException(e);
155149
}
156150
}

presto-client/src/main/java/com/facebook/presto/client/OkHttpUtil.java

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import com.facebook.airlift.security.pem.PemReader;
1717
import com.google.common.base.CharMatcher;
1818
import com.google.common.net.HostAndPort;
19+
import okhttp.internal.tls.LegacyHostnameVerifier;
1920
import okhttp3.Call;
2021
import okhttp3.Callback;
2122
import okhttp3.Credentials;
@@ -237,6 +238,7 @@ public static void setupSsl(
237238
sslContext.init(keyManagers, new TrustManager[] {trustManager}, null);
238239

239240
clientBuilder.sslSocketFactory(sslContext.getSocketFactory(), trustManager);
241+
clientBuilder.hostnameVerifier(LegacyHostnameVerifier.INSTANCE);
240242
}
241243
catch (GeneralSecurityException | IOException e) {
242244
throw new ClientException("Error setting up SSL: " + e.getMessage(), e);

0 commit comments

Comments
 (0)