From f51a640309bab01b9201f5c609f10f531383c8fe Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Thu, 29 Jun 2023 14:40:25 +0200 Subject: [PATCH] Polishing JdkClientHttpRequestFactory --- .../http/client/JdkClientHttpRequest.java | 12 +++++++++++- .../client/JdkClientHttpRequestFactory.java | 18 +++++++++++++++++- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/http/client/JdkClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/JdkClientHttpRequest.java index 29c1882e59a..9240bce86ec 100644 --- a/spring-web/src/main/java/org/springframework/http/client/JdkClientHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/client/JdkClientHttpRequest.java @@ -24,6 +24,7 @@ import java.net.http.HttpClient; import java.net.http.HttpRequest; import java.net.http.HttpResponse; import java.nio.ByteBuffer; +import java.time.Duration; import java.util.List; import java.util.concurrent.Executor; import java.util.concurrent.Flow; @@ -58,12 +59,17 @@ class JdkClientHttpRequest extends AbstractStreamingClientHttpRequest { private final Executor executor; + @Nullable + private final Duration timeOut; - public JdkClientHttpRequest(HttpClient httpClient, URI uri, HttpMethod method, Executor executor) { + + public JdkClientHttpRequest(HttpClient httpClient, URI uri, HttpMethod method, Executor executor, + @Nullable Duration readTimeout) { this.httpClient = httpClient; this.uri = uri; this.method = method; this.executor = executor; + this.timeOut = readTimeout; } @Override @@ -98,6 +104,10 @@ class JdkClientHttpRequest extends AbstractStreamingClientHttpRequest { HttpRequest.Builder builder = HttpRequest.newBuilder() .uri(this.uri); + if (this.timeOut != null) { + builder.timeout(this.timeOut); + } + headers.forEach((headerName, headerValues) -> { if (!headerName.equalsIgnoreCase(HttpHeaders.CONTENT_LENGTH)) { if (!DISALLOWED_HEADERS.contains(headerName.toLowerCase())) { diff --git a/spring-web/src/main/java/org/springframework/http/client/JdkClientHttpRequestFactory.java b/spring-web/src/main/java/org/springframework/http/client/JdkClientHttpRequestFactory.java index 853a6728ce2..1ff226a8711 100644 --- a/spring-web/src/main/java/org/springframework/http/client/JdkClientHttpRequestFactory.java +++ b/spring-web/src/main/java/org/springframework/http/client/JdkClientHttpRequestFactory.java @@ -19,10 +19,12 @@ package org.springframework.http.client; import java.io.IOException; import java.net.URI; import java.net.http.HttpClient; +import java.time.Duration; import java.util.concurrent.Executor; import org.springframework.core.task.SimpleAsyncTaskExecutor; import org.springframework.http.HttpMethod; +import org.springframework.lang.Nullable; import org.springframework.util.Assert; @@ -40,6 +42,9 @@ public class JdkClientHttpRequestFactory implements ClientHttpRequestFactory { private final Executor executor; + @Nullable + private Duration readTimeout; + /** * Create a new instance of the {@code JdkClientHttpRequestFactory} @@ -74,9 +79,20 @@ public class JdkClientHttpRequestFactory implements ClientHttpRequestFactory { } + /** + * Set the underlying {@code HttpClient}'s read timeout (in milliseconds). + * A timeout value of 0 specifies an infinite timeout. + *

Default is the system's default timeout. + * @see java.net.http.HttpRequest.Builder#timeout + */ + public void setReadTimeout(int readTimeout) { + this.readTimeout = Duration.ofMillis(readTimeout); + } + + @Override public ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod) throws IOException { - return new JdkClientHttpRequest(this.httpClient, uri, httpMethod, this.executor); + return new JdkClientHttpRequest(this.httpClient, uri, httpMethod, this.executor, this.readTimeout); } }