* http_client: update okhttp to 5.1.0

Signed-off-by: neo <1100909+neowu@users.noreply.github.com>

Author: neowu

CHANGELOG.md

@@ -3,6 +3,7 @@
 ### 9.2.3 (7/2/2025 - )
 
 * db: support postgres enum type
+* http_client: update okhttp to 5.1.0
 
 ### 9.2.2 (5/21/2025 - 6/26/2025)
 

build.gradle.kts

@@ -7,7 +7,7 @@ apply(plugin = "project")
 
 subprojects {
     group = "core.framework"
-    version = "9.2.3-b0"
+    version = "9.2.3"
     repositories {
         maven {
             url = uri("https://neowu.github.io/maven-repo/")
@@ -36,7 +36,7 @@ project("core-ng") {
         implementation("org.javassist:javassist:3.30.2-GA")
         implementation("com.fasterxml.jackson.module:jackson-module-afterburner:${jacksonVersion}")
         implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jacksonVersion}")
-        implementation("com.squareup.okhttp3:okhttp:4.12.0")
+        implementation("com.squareup.okhttp3:okhttp:5.1.0")
         implementation("io.undertow:undertow-core:2.3.18.Final")
         implementation("org.apache.kafka:kafka-clients:4.0.0") {
             exclude("org.xerial.snappy")

core-ng/src/main/java/core/framework/internal/http/HTTPClientImpl.java

@@ -18,7 +18,6 @@
 import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
-import okhttp3.ResponseBody;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -158,9 +157,7 @@ private byte[] body(Response httpResponse, int statusCode) throws IOException {
             // refer to https://tools.ietf.org/html/rfc7230#section-3.3.2, with 204, server won't send body and content-length, hence no need to read it, and body will be quietly closed by response.close()
             body = new byte[0];
         } else {
-            ResponseBody responseBody = httpResponse.body();
-            if (responseBody == null) throw new Error("unexpected response body"); // refer to okhttp3.Response.body(), call.execute always return non-null body except for cachedResponse/networkResponse
-            body = responseBody.bytes();
+            body = httpResponse.body().bytes();
         }
         return body;
     }

core-ng/src/main/java/core/framework/internal/http/RetryInterceptor.java

@@ -7,8 +7,6 @@
 import okhttp3.Interceptor;
 import okhttp3.Request;
 import okhttp3.Response;
-import okhttp3.ResponseBody;
-import okhttp3.internal.connection.RouteException;
 import okhttp3.internal.http2.ConnectionShutdownException;
 import okhttp3.internal.http2.ErrorCode;
 import okhttp3.internal.http2.StreamResetException;
@@ -22,7 +20,6 @@
 import java.time.Duration;
 
 import static core.framework.log.Markers.errorCode;
-import static okhttp3.internal.Util.closeQuietly;
 
 /**
  * @author neo
@@ -47,11 +44,11 @@ public Response intercept(Chain chain) throws IOException {
                 int statusCode = response.code();
                 if (shouldRetry(statusCode, attempts)) {    // do not check call.isCanceled(), RetryAndFollowUpInterceptor already checked and throw exception
                     logger.warn(errorCode("HTTP_REQUEST_FAILED"), "http request failed, retry soon, responseStatus={}, uri={}", statusCode, uri(request));
-                    closeResponseBody(response);
+                    response.close();
                 } else {
                     return response;
                 }
-            } catch (IOException | RouteException e) {
+            } catch (IOException e) {
                 if (shouldRetry(chain.call().isCanceled(), request.method(), attempts, e)) {
                     logger.warn(errorCode("HTTP_REQUEST_FAILED"), "http request failed, retry soon, uri={}, error={}", uri(request), e.getMessage(), e);
                 } else {
@@ -72,13 +69,6 @@ String uri(Request request) {
         return request.url().newBuilder().query(null).build().toString();
     }
 
-    // response.close asserts body not null, refer to Response.close()
-    // RetryAndFollowUpInterceptor also closes body directly
-    private void closeResponseBody(Response response) {
-        ResponseBody body = response.body();
-        if (body != null) closeQuietly(body);
-    }
-
     boolean shouldRetry(int statusCode, int attempts) {
         if (statusCode == HTTPStatus.SERVICE_UNAVAILABLE.code || statusCode == HTTPStatus.TOO_MANY_REQUESTS.code) {
             if (attempts >= maxRetries) return false;
@@ -93,7 +83,6 @@ boolean shouldRetry(boolean canceled, String method, int attempts, Exception e)
         if (attempts >= maxRetries) return false;
         if (!withinMaxProcessTime(attempts)) return false;
 
-        if (e instanceof RouteException) return true;   // if it's route failure, then request is not sent yet
         if (e instanceof ConnectionShutdownException) return true;  // refer to RetryAndFollowUpInterceptor -> requestSendStarted = e !is ConnectionShutdownException
 
         // only not retry on POST if request sent