Merge pull request #19244 from geoand/#19223-follow-up

Add test for rest-client reactive timeout
quarkusio · Aug 19, 2021 · 1458b75 · 1458b75
2 parents 8017b6e + b4a0b31
commit 1458b75
Show file tree

Hide file tree

Showing 4 changed files with 123 additions and 56 deletions.
diff --git a/...ent/reactive/timeout/ReadTimeoutTest.java → ...ctive/timeout/BuilderReadTimeoutTest.java b/...ent/reactive/timeout/ReadTimeoutTest.java → ...ctive/timeout/BuilderReadTimeoutTest.java
@@ -4,9 +4,17 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.net.URI;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
 import org.eclipse.microprofile.rest.client.RestClientBuilder;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
@@ -16,7 +24,7 @@
 import io.quarkus.test.QuarkusUnitTest;
 import io.quarkus.test.common.http.TestHTTPResource;
 
-public class ReadTimeoutTest {
+public class BuilderReadTimeoutTest {
 
     @TestHTTPResource
     URI uri;
@@ -55,4 +63,36 @@ void shouldNotTimeoutOnDefaultTimeout() {
 
         assertThat(client.slow()).isEqualTo("slow-response");
     }
+
+    @Produces(MediaType.TEXT_PLAIN)
+    @Consumes(MediaType.TEXT_PLAIN)
+    public static interface Client {
+        @GET
+        @Path("/slow")
+        String slow();
+
+        @GET
+        @Path("/fast")
+        String fast();
+    }
+
+    @Path("/")
+    @Produces(MediaType.TEXT_PLAIN)
+    @Consumes(MediaType.TEXT_PLAIN)
+    public static class Resource {
+
+        @Path("/slow")
+        @GET
+        public String slow() throws InterruptedException {
+            Thread.sleep(5000L);
+            return "slow-response";
+        }
+
+        @Path("/fast")
+        @GET
+        public CompletionStage<String> fast() {
+            return CompletableFuture.completedFuture("fast-response");
+        }
+
+    }
 }
diff --git a/...ent-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/timeout/Client.java b/...ent-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/timeout/Client.java
diff --git a/...oyment/src/test/java/io/quarkus/rest/client/reactive/timeout/RegisterReadTimeoutTest.java b/...oyment/src/test/java/io/quarkus/rest/client/reactive/timeout/RegisterReadTimeoutTest.java
@@ -0,0 +1,82 @@
+package io.quarkus.rest.client.reactive.timeout;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.TimeoutException;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+import org.eclipse.microprofile.rest.client.inject.RestClient;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class RegisterReadTimeoutTest {
+
+    @RestClient
+    Client client;
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Client.class, Resource.class)
+                    .addAsResource(new StringAsset(
+                            "client/mp-rest/readTimeout=1000\nclient/mp-rest/url=http://${quarkus.http.host}:${quarkus.http.test-port}"),
+                            "application.properties"));
+
+    @Test
+    void shouldTimeoutIfReadTimeoutSetShort() {
+        RuntimeException exception = assertThrows(RuntimeException.class, client::slow);
+        assertThat(exception).hasCauseInstanceOf(TimeoutException.class);
+    }
+
+    @Test
+    void shouldNotTimeoutOnFastResponse() {
+        assertThat(client.fast()).isEqualTo("fast-response");
+    }
+
+    @Produces(MediaType.TEXT_PLAIN)
+    @Consumes(MediaType.TEXT_PLAIN)
+    @RegisterRestClient(configKey = "client")
+    public interface Client {
+        @GET
+        @Path("/slow")
+        String slow();
+
+        @GET
+        @Path("/fast")
+        String fast();
+    }
+
+    @Path("/")
+    @Produces(MediaType.TEXT_PLAIN)
+    @Consumes(MediaType.TEXT_PLAIN)
+    public static class Resource {
+
+        @Path("/slow")
+        @GET
+        public String slow() throws InterruptedException {
+            Thread.sleep(5000L);
+            return "slow-response";
+        }
+
+        @Path("/fast")
+        @GET
+        public CompletionStage<String> fast() {
+            return CompletableFuture.completedFuture("fast-response");
+        }
+
+    }
+}
diff --git a/...t-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/timeout/Resource.java b/...t-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/timeout/Resource.java