From d2ca155c002f4cb9c0c2d22d71616b04ee881f6d Mon Sep 17 00:00:00 2001
From: Brutus5000 <Brutus5000@gmx.net>
Date: Tue, 20 Aug 2024 00:12:07 +0200
Subject: [PATCH] Use JdkClientHttpRequestFactory for RestTemplate

---
 .../moderatorclient/api/FafApiCommunicationService.java     | 5 ++++-
 .../moderatorclient/api/FafUserCommunicationService.java    | 2 ++
 .../com/faforever/moderatorclient/api/TokenService.java     | 6 +++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/faforever/moderatorclient/api/FafApiCommunicationService.java b/src/main/java/com/faforever/moderatorclient/api/FafApiCommunicationService.java
index 2dfd5af..764a5c2 100644
--- a/src/main/java/com/faforever/moderatorclient/api/FafApiCommunicationService.java
+++ b/src/main/java/com/faforever/moderatorclient/api/FafApiCommunicationService.java
@@ -26,6 +26,7 @@
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.http.client.JdkClientHttpRequestFactory;
 import org.springframework.security.oauth2.client.resource.OAuth2AccessDeniedException;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -99,7 +100,9 @@ public boolean hasPermission(String... permissionTechnicalName) {
     public void authorize(HydraAuthorizedEvent event) {
         meResult = null;
 
-        restTemplate = restTemplateBuilder.additionalMessageConverters(jsonApiMessageConverter)
+        restTemplate = restTemplateBuilder
+                .requestFactory(JdkClientHttpRequestFactory.class)
+                .additionalMessageConverters(jsonApiMessageConverter)
                 .setReadTimeout(Duration.ofMinutes(5))
                 .errorHandler(jsonApiErrorHandler)
                 .rootUri(environmentProperties.getBaseUrl())
diff --git a/src/main/java/com/faforever/moderatorclient/api/FafUserCommunicationService.java b/src/main/java/com/faforever/moderatorclient/api/FafUserCommunicationService.java
index 094ed67..6d03005 100644
--- a/src/main/java/com/faforever/moderatorclient/api/FafUserCommunicationService.java
+++ b/src/main/java/com/faforever/moderatorclient/api/FafUserCommunicationService.java
@@ -8,6 +8,7 @@
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.event.EventListener;
+import org.springframework.http.client.JdkClientHttpRequestFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestOperations;
 import org.springframework.web.client.RestTemplate;
@@ -46,6 +47,7 @@ public void initialize(EnvironmentProperties environmentProperties) {
     @EventListener
     public void authorize(HydraAuthorizedEvent event) {
         restTemplate = restTemplateBuilder
+                .requestFactory(JdkClientHttpRequestFactory.class)
                 .rootUri(environmentProperties.getUserBaseUrl())
                 .interceptors(oAuthTokenInterceptor)
                 .build();
diff --git a/src/main/java/com/faforever/moderatorclient/api/TokenService.java b/src/main/java/com/faforever/moderatorclient/api/TokenService.java
index ef7ee4b..25353d7 100644
--- a/src/main/java/com/faforever/moderatorclient/api/TokenService.java
+++ b/src/main/java/com/faforever/moderatorclient/api/TokenService.java
@@ -10,6 +10,7 @@
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
+import org.springframework.http.client.JdkClientHttpRequestFactory;
 import org.springframework.security.oauth2.common.OAuth2AccessToken;
 import org.springframework.stereotype.Service;
 import org.springframework.util.LinkedMultiValueMap;
@@ -32,7 +33,10 @@ public TokenService(ApplicationEventPublisher applicationEventPublisher) {
 
   public void prepare(EnvironmentProperties environmentProperties) {
     this.environmentProperties = environmentProperties;
-    this.restTemplate = new RestTemplateBuilder().rootUri(environmentProperties.getOauthBaseUrl()).build();
+    this.restTemplate = new RestTemplateBuilder()
+            .requestFactory(JdkClientHttpRequestFactory.class)
+            .rootUri(environmentProperties.getOauthBaseUrl())
+            .build();
   }
 
   @SneakyThrows