tmp

quarkusio · Aug 5, 2021 · 777abc1 · 777abc1
1 parent eb009f3
commit 777abc1
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 16 deletions.
diff --git a/...test/java/io/quarkus/rest/client/reactive/provider/ProviderDisabledAutodiscoveryTest.java b/...test/java/io/quarkus/rest/client/reactive/provider/ProviderDisabledAutodiscoveryTest.java
@@ -15,6 +15,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+import io.quarkus.rest.client.reactive.HelloClient2;
 import io.quarkus.rest.client.reactive.HelloResource;
 import io.quarkus.test.QuarkusUnitTest;
 import io.quarkus.test.common.http.TestHTTPResource;
@@ -24,9 +25,10 @@ public class ProviderDisabledAutodiscoveryTest {
     @RegisterExtension
     static final QuarkusUnitTest config = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(HelloResource.class, HelloClient.class, GlobalRequestFilter.class, GlobalResponseFilter.class)
+                    .addClasses(HelloResource.class, HelloClient.class, HelloClient2.class, GlobalRequestFilter.class,
+                            GlobalResponseFilter.class)
                     .addAsResource(
-                            new StringAsset(setUrlForClass(HelloClient.class)
+                            new StringAsset(setUrlForClass(HelloClient.class) + setUrlForClass(HelloClient2.class)
                                     + "quarkus.rest-client-reactive.provider-autodiscovery=false"),
                             "application.properties"));
 

diff --git a/...ployment/src/test/java/io/quarkus/rest/client/reactive/provider/ProviderPriorityTest.java b/...ployment/src/test/java/io/quarkus/rest/client/reactive/provider/ProviderPriorityTest.java
@@ -13,6 +13,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+import io.quarkus.rest.client.reactive.HelloClient2;
 import io.quarkus.rest.client.reactive.HelloResource;
 import io.quarkus.test.QuarkusUnitTest;
 
@@ -23,12 +24,13 @@ public class ProviderPriorityTest {
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
                     .addClasses(HelloResource.class,
                             HelloClient.class,
+                            HelloClient2.class,
                             HelloClientWithFilter.class,
                             ResponseFilterLowestPrio.class,
                             GlobalResponseFilter.class,
                             GlobalResponseFilterLowPrio.class)
                     .addAsResource(
-                            new StringAsset(setUrlForClass(HelloClient.class)
+                            new StringAsset(setUrlForClass(HelloClient.class) + setUrlForClass(HelloClient2.class)
                                     + setUrlForClass(HelloClientWithFilter.class)),
                             "application.properties"));
 

diff --git a/...ctive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/ProviderTest.java b/...ctive/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/ProviderTest.java
@@ -16,6 +16,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+import io.quarkus.rest.client.reactive.HelloClient2;
 import io.quarkus.rest.client.reactive.HelloResource;
 import io.quarkus.test.QuarkusUnitTest;
 import io.quarkus.test.common.http.TestHTTPResource;
@@ -25,11 +26,11 @@ public class ProviderTest {
     @RegisterExtension
     static final QuarkusUnitTest config = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(HelloResource.class, HelloClient.class, GlobalRequestFilter.class,
+                    .addClasses(HelloResource.class, HelloClient.class, GlobalRequestFilter.class, HelloClient2.class,
                             GlobalResponseFilter.class, GlobalRequestFilterConstrainedToServer.class,
                             GlobalFeature.class)
                     .addAsResource(
-                            new StringAsset(setUrlForClass(HelloClient.class)),
+                            new StringAsset(setUrlForClass(HelloClient.class) + setUrlForClass(HelloClient2.class)),
                             "application.properties"));
 
     @RestClient

diff --git a/...ntime/src/main/java/org/jboss/resteasy/reactive/client/impl/RestClientRequestContext.java b/...ntime/src/main/java/org/jboss/resteasy/reactive/client/impl/RestClientRequestContext.java
@@ -158,12 +158,12 @@ public ClientResponseContextImpl getOrCreateClientResponseContext() {
 
     @Override
     protected Executor getContextExecutor() {
-        if (httpClientRequest != null) {
-            return ((ConnectionBase) httpClientRequest.connection()).getContext().nettyEventLoop();
-        }
         if (Context.isOnEventLoopThread()) {
             return ((ContextInternal) restClient.getVertx().getOrCreateContext()).nettyEventLoop();
         }
+        if (httpClientRequest != null) {
+            return ((ConnectionBase) httpClientRequest.connection()).getContext().nettyEventLoop();
+        }
         return null;
     }
 
@@ -215,22 +215,20 @@ public HttpClientResponse getVertxClientResponse() {
 
     @Override
     protected Executor getEventLoop() {
-        if (httpClientRequest == null) {
-            // make sure we execute the client callbacks on the same context as the current thread
+        if (Context.isOnEventLoopThread()) {
             Context context = restClient.getVertx().getOrCreateContext();
             return new Executor() {
                 @Override
                 public void execute(Runnable command) {
                     context.runOnContext(v -> command.run());
                 }
             };
+        } else if (httpClientRequest == null) {
+            //we are on a worker and have no bound event loop
+            //this should never really happen
+            return restClient.getVertx().nettyEventLoopGroup().next();
         } else {
-            return new Executor() {
-                @Override
-                public void execute(Runnable command) {
-                    command.run();
-                }
-            };
+            return ((ConnectionBase) httpClientRequest.connection()).channel().eventLoop();
         }
     }