From c7878f3f3c8e4e1433811bdf10bfdc711e8e5abf Mon Sep 17 00:00:00 2001
From: Martin Kofoed <jb2948@jyskebank.dk>
Date: Wed, 22 Nov 2023 15:15:42 +0100
Subject: [PATCH] When skipping @Provider auto-discovery for REST clients, take
 ClientRequestFilters into consideration

---
 .../RestClientReactiveProcessor.java          | 35 +++++++++++++------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/RestClientReactiveProcessor.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/RestClientReactiveProcessor.java
index 22a4b76f9b69ea..1b3cf9c7b37052 100644
--- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/RestClientReactiveProcessor.java
+++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/RestClientReactiveProcessor.java
@@ -38,6 +38,7 @@
 import jakarta.inject.Singleton;
 import jakarta.ws.rs.Priorities;
 import jakarta.ws.rs.RuntimeType;
+import jakarta.ws.rs.client.ClientRequestFilter;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.MultivaluedMap;
 
@@ -297,17 +298,9 @@ void registerProvidersFromAnnotations(CombinedIndexBuildItem indexBuildItem,
                         }
                     }
 
-                    List<DotName> providerInterfaceNames = providerClass.interfaceNames();
-                    // don't register server specific types
-                    if (providerInterfaceNames.contains(ResteasyReactiveDotNames.CONTAINER_REQUEST_FILTER)
-                            || providerInterfaceNames.contains(ResteasyReactiveDotNames.CONTAINER_RESPONSE_FILTER)
-                            || providerInterfaceNames.contains(ResteasyReactiveDotNames.EXCEPTION_MAPPER)) {
+                    if (skipAutoDiscovery(providerClass.interfaceNames())) {
                         continue;
-                    }
-
-                    if (providerInterfaceNames.contains(ResteasyReactiveDotNames.FEATURE)) {
-                        continue; // features should not be automatically registered for the client, see javadoc for Feature
-                    }
+                    } 
 
                     DotName providerDotName = providerClass.name();
                     int priority = getAnnotatedPriority(index, providerDotName.toString(), Priorities.USER);
@@ -580,6 +573,28 @@ && isImplementorOf(index, target.asClass(), RESPONSE_EXCEPTION_MAPPER, Set.of(AP
         }
     }
 
+    /**
+     * Based on a list of interfaces implemented by @Provider class, determine if registration
+     * should be skipped or not. Server-specific types should be omitted unless implementation
+     * of a <code>ClientRequestFilter</code> exists on the same class explicitly. 
+     * Features should always be omitted.
+     */
+    private boolean skipAutoDiscovery(List<DotName> providerInterfaceNames) {
+        if (providerInterfaceNames.contains(ResteasyReactiveDotNames.FEATURE)) {
+            return true; 
+        }
+        if (providerInterfaceNames.contains(ResteasyReactiveDotNames.CONTAINER_REQUEST_FILTER)
+                || providerInterfaceNames.contains(ResteasyReactiveDotNames.CONTAINER_RESPONSE_FILTER)
+                || providerInterfaceNames.contains(ResteasyReactiveDotNames.EXCEPTION_MAPPER)) {
+            if (providerInterfaceNames.contains(DotName.createSimple(ClientRequestFilter.class.getName()))) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+        return false;
+    }
+
     private Map<String, GeneratedClassResult> populateClientExceptionMapperFromAnnotations(
             BuildProducer<GeneratedClassBuildItem> generatedClasses,
             BuildProducer<ReflectiveClassBuildItem> reflectiveClasses, IndexView index) {