Add support for Request Timeouts to HTTP/2 Java 11 Client. (#1233)

ChunMengLu · web-flow · commit afb9ef890174 · 2020-07-02T10:10:00.000-04:00
Adds `Request.Options` to the HTTP/2 Client Request Builder.
diff --git a/java11/src/main/java/feign/http2client/Http2Client.java b/java11/src/main/java/feign/http2client/Http2Client.java
@@ -13,8 +13,11 @@
  */
 package feign.http2client;
 
-import feign.*;
+import feign.Client;
+import feign.Request;
 import feign.Request.Options;
+import feign.Response;
+import feign.Util;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.net.URI;
@@ -28,6 +31,7 @@
 import java.net.http.HttpRequest.Builder;
 import java.net.http.HttpResponse;
 import java.net.http.HttpResponse.BodyHandlers;
+import java.time.Duration;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -46,12 +50,13 @@ public Http2Client(HttpClient client) {
 
   @Override
   public Response execute(Request request, Options options) throws IOException {
-    final HttpRequest httpRequest = newRequestBuilder(request).build();
+    final HttpRequest httpRequest = newRequestBuilder(request, options).build();
 
     HttpResponse<byte[]> httpResponse;
     try {
       httpResponse = client.send(httpRequest, BodyHandlers.ofByteArray());
     } catch (final InterruptedException e) {
+      Thread.currentThread().interrupt();
       throw new IOException("Invalid uri " + request.url(), e);
     }
 
@@ -70,7 +75,7 @@ public Response execute(Request request, Options options) throws IOException {
     return response;
   }
 
-  private Builder newRequestBuilder(Request request) throws IOException {
+  private Builder newRequestBuilder(Request request, Options options) throws IOException {
     URI uri;
     try {
       uri = new URI(request.url());
@@ -86,7 +91,11 @@ private Builder newRequestBuilder(Request request) throws IOException {
       body = BodyPublishers.ofByteArray(data);
     }
 
-    final Builder requestBuilder = HttpRequest.newBuilder().uri(uri).version(Version.HTTP_2);
+    final Builder requestBuilder =
+        HttpRequest.newBuilder()
+            .uri(uri)
+            .timeout(Duration.ofMillis(options.readTimeoutMillis()))
+            .version(Version.HTTP_2);
 
     final Map<String, Collection<String>> headers = filterRestrictedHeaders(request.headers());
     if (!headers.isEmpty()) {
@@ -159,7 +168,6 @@ private String[] asString(Map<String, Collection<String>> headers) {
                 entry.getValue().stream()
                     .map(value -> Arrays.asList(entry.getKey(), value))
                     .flatMap(List::stream))
-        .collect(Collectors.toList())
-        .toArray(new String[0]);
+        .toArray(String[]::new);
   }
 }
diff --git a/java11/src/test/java/feign/http2client/test/Http2ClientTest.java b/java11/src/test/java/feign/http2client/test/Http2ClientTest.java
@@ -19,8 +19,11 @@
 import feign.client.AbstractClientTest;
 import feign.http2client.Http2Client;
 import java.io.IOException;
+import java.net.http.HttpTimeoutException;
+import java.util.concurrent.TimeUnit;
 import okhttp3.mockwebserver.MockResponse;
 import org.assertj.core.api.Assertions;
+import org.hamcrest.CoreMatchers;
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -36,6 +39,10 @@ public interface TestInterface {
     @RequestLine("PATCH /patch")
     @Headers({"Accept: text/plain"})
     String patch();
+
+    @RequestLine("POST /timeout")
+    @Headers({"Accept: text/plain"})
+    String timeout();
   }
 
   @Override
@@ -78,6 +85,22 @@ public void testVeryLongResponseNullLength() {
     // client is too smart to fall for a body that is 8 bytes long
   }
 
+  @Test
+  public void timeoutTest() {
+    server.enqueue(new MockResponse().setBody("foo").setBodyDelay(30, TimeUnit.SECONDS));
+
+    final TestInterface api =
+        newBuilder()
+            .retryer(Retryer.NEVER_RETRY)
+            .options(new Request.Options(1, TimeUnit.SECONDS, 1, TimeUnit.SECONDS, true))
+            .target(TestInterface.class, server.url("/").toString());
+
+    thrown.expect(FeignException.class);
+    thrown.expectCause(CoreMatchers.isA(HttpTimeoutException.class));
+
+    api.timeout();
+  }
+
   @Override
   public Feign.Builder newBuilder() {
     return Feign.builder().client(new Http2Client());
