BAEL-8908 Reading with timeout in HttpComponentsClientHttpRequestFactory (#18380)

* Update pom.xml

* Update RestTemplateBasicLiveTest.java

Author: dvohra09

spring-web-modules/spring-resttemplate/pom.xml

@@ -16,6 +16,18 @@
 
     <dependencies>
         <!-- Spring Boot Dependencies -->
+         <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents.client5/httpclient5 -->
+        <dependency>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+            <version>5.4.2</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents.core5/httpcore5 -->
+        <dependency>
+            <groupId>org.apache.httpcomponents.core5</groupId>
+            <artifactId>httpcore5</artifactId>
+            <version>5.3.3</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -205,11 +217,11 @@
     </profiles>
 
     <properties>
-        <xstream.version>1.4.20</xstream.version>
+        <xstream.version>1.4.21</xstream.version>
         <!-- Maven plugins -->
-        <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
+        <cargo-maven2-plugin.version>1.9.0</cargo-maven2-plugin.version>
         <!-- okhttp -->
         <com.squareup.okhttp3.version>4.12.0</com.squareup.okhttp3.version>
     </properties>
 
-</project>
+</project>

spring-web-modules/spring-resttemplate/src/test/java/com/baeldung/resttemplate/RestTemplateBasicLiveTest.java

@@ -28,7 +28,13 @@
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.client.RequestCallback;
-import org.springframework.web.client.RestTemplate;
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.core5.util.Timeout;
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
+import org.apache.hc.core5.http.io.SocketConfig;
+import org.apache.hc.client5.http.config.ConnectionConfig;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -187,6 +193,7 @@ public void givenFooService_whenPatchExistingEntity_thenItIsUpdated() {
             .getId();
         final HttpEntity<Foo> requestUpdate = new HttpEntity<>(updatedResource, headers);
         final ClientHttpRequestFactory requestFactory = getClientHttpRequestFactory();
+        final ClientHttpRequestFactory requestFactoryAlternate = getClientHttpRequestFactoryAlternate();
         final RestTemplate template = new RestTemplate(requestFactory);
         template.setMessageConverters(Arrays.asList(new MappingJackson2HttpMessageConverter()));
         template.patchForObject(resourceUrl, requestUpdate, Void.class);
@@ -262,9 +269,44 @@ private RequestCallback requestCallback(final Foo updatedInstance) {
 
     ClientHttpRequestFactory getClientHttpRequestFactory() {
         final int timeout = 5;
-        final HttpComponentsClientHttpRequestFactory clientHttpRequestFactory = new HttpComponentsClientHttpRequestFactory();
-        clientHttpRequestFactory.setConnectTimeout(timeout * 1000);
+        final HttpComponentsClientHttpRequestFactory
+        clientHttpRequestFactory = new
+        HttpComponentsClientHttpRequestFactory();
+        clientHttpRequestFactory.setConnectionRequestTimeout(timeout * 1000);
+        clientHttpRequestFactory.setConnectTimeout(timeout * 2000);
+        //clientHttpRequestFactory.setReadTimeout(timeout * 3000);
         return clientHttpRequestFactory;
-    }
+        }
+    
+        // Alternate GET ClientHttpRequestFactory
+        ClientHttpRequestFactory getClientHttpRequestFactoryAlternate() {
+            long timeout = 5;
+            int readTimeout = 5;
+            // Connect timeout
+            ConnectionConfig connectionConfig = ConnectionConfig.custom()
+              .setConnectTimeout(Timeout.ofMilliseconds(timeout * 2000))
+              .build();
+            // Connection request timeout
+            RequestConfig requestConfig = RequestConfig.custom()
+              .setConnectionRequestTimeout(Timeout.ofMilliseconds(timeout * 1000))
+              .build();
+            // Socket timeout 
+            SocketConfig socketConfig = SocketConfig.custom()
+              .setSoTimeout(Timeout.ofMilliseconds(timeout * 1000)).build();
+            PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager();
+            connectionManager.setDefaultSocketConfig(socketConfig);
+            connectionManager.setDefaultConnectionConfig(connectionConfig);
+            CloseableHttpClient httpClient = HttpClientBuilder.create()
+              .setConnectionManager(connectionManager)
+              .setDefaultRequestConfig(requestConfig)
+              .build();
+            
+            /**final HttpComponentsClientHttpRequestFactory 
+            clientHttpRequestFactory = new HttpComponentsClientHttpRequestFactory(httpClient);
+            clientHttpRequestFactory.setReadTimeout(readTimeout*3000);**/
+            //return clientHttpRequestFactory; 
+            
+            return new HttpComponentsClientHttpRequestFactory(httpClient);
+        }
 
 }