(james-project) 04/04: JAMES-4104 [webadmin-cli] Update feign client - use okhttp client instead of default

[rcordier]

This is an automated email from the ASF dual-hosted git repository.

rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 57e5547d35e06a838a76f38333fb29e5f2d2275e
Author: TungTV <vtt...@linagora.com>
AuthorDate: Tue Feb 11 10:48:58 2025 +0700

    JAMES-4104 [webadmin-cli] Update feign client - use okhttp client instead 
of default
    
    - In order to fix the issue EoFException when upgrade new spark
---
 server/protocols/webadmin/webadmin-http-client/pom.xml               | 5 +++++
 .../main/java/org/apache/james/webadmin/httpclient/FeignHelper.java  | 3 +++
 .../apache/james/webadmin/httpclient/WebAdminHTTPClientFactory.java  | 2 ++
 3 files changed, 10 insertions(+)

diff --git a/server/protocols/webadmin/webadmin-http-client/pom.xml 
b/server/protocols/webadmin/webadmin-http-client/pom.xml
index 77d7fb56f3..3b3a075f66 100644
--- a/server/protocols/webadmin/webadmin-http-client/pom.xml
+++ b/server/protocols/webadmin/webadmin-http-client/pom.xml
@@ -48,6 +48,11 @@
             <artifactId>feign-jackson</artifactId>
             <version>${feign.version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-okhttp</artifactId>
+            <version>${feign.version}</version>
+        </dependency>
         <dependency>
             <groupId>io.github.openfeign</groupId>
             <artifactId>feign-slf4j</artifactId>
diff --git 
a/server/protocols/webadmin/webadmin-http-client/src/main/java/org/apache/james/webadmin/httpclient/FeignHelper.java
 
b/server/protocols/webadmin/webadmin-http-client/src/main/java/org/apache/james/webadmin/httpclient/FeignHelper.java
index cd0b69e0f0..f495ae3b2d 100644
--- 
a/server/protocols/webadmin/webadmin-http-client/src/main/java/org/apache/james/webadmin/httpclient/FeignHelper.java
+++ 
b/server/protocols/webadmin/webadmin-http-client/src/main/java/org/apache/james/webadmin/httpclient/FeignHelper.java
@@ -31,6 +31,9 @@ public class FeignHelper {
 
     public static String extractBody(Response response) {
         try {
+            if (response.body() == null) {
+                return null;
+            }
             return IOUtils.toString(response.body().asInputStream(), 
StandardCharsets.UTF_8);
         } catch (IOException e) {
             throw new RuntimeException(e);
diff --git 
a/server/protocols/webadmin/webadmin-http-client/src/main/java/org/apache/james/webadmin/httpclient/WebAdminHTTPClientFactory.java
 
b/server/protocols/webadmin/webadmin-http-client/src/main/java/org/apache/james/webadmin/httpclient/WebAdminHTTPClientFactory.java
index b9066292ed..9d5c213c64 100644
--- 
a/server/protocols/webadmin/webadmin-http-client/src/main/java/org/apache/james/webadmin/httpclient/WebAdminHTTPClientFactory.java
+++ 
b/server/protocols/webadmin/webadmin-http-client/src/main/java/org/apache/james/webadmin/httpclient/WebAdminHTTPClientFactory.java
@@ -23,6 +23,7 @@ import feign.Feign;
 import feign.Logger;
 import feign.jackson.JacksonDecoder;
 import feign.jackson.JacksonEncoder;
+import feign.okhttp.OkHttpClient;
 import feign.slf4j.Slf4jLogger;
 
 public class WebAdminHTTPClientFactory {
@@ -34,6 +35,7 @@ public class WebAdminHTTPClientFactory {
 
     public static Feign.Builder feignBuilder() {
         return Feign.builder()
+            .client(new OkHttpClient())
             .decoder(new JacksonDecoder())
             .encoder(new JacksonEncoder())
             .logger(new Slf4jLogger("james-webadmin-http-client"))


---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@james.apache.org
For additional commands, e-mail: notifications-h...@james.apache.org