Remove deprecated ClientProxyUnwrapper in RESTEasy Reactive

quarkusio · Mar 29, 2023 · bd84687 · bd84687
1 parent 27766c5
commit bd84687
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/...c/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveProcessor.java b/...c/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveProcessor.java
@@ -120,7 +120,6 @@
 import io.quarkus.arc.deployment.GeneratedBeanBuildItem;
 import io.quarkus.arc.deployment.UnremovableBeanBuildItem;
 import io.quarkus.arc.runtime.BeanContainer;
-import io.quarkus.arc.runtime.ClientProxyUnwrapper;
 import io.quarkus.deployment.Capabilities;
 import io.quarkus.deployment.Capability;
 import io.quarkus.deployment.Feature;
@@ -1194,7 +1193,7 @@ public void setupDeployment(BeanContainerBuildItem beanContainerBuildItem,
                 .setExceptionMapping(exceptionMapping)
                 .setCtxResolvers(contextResolvers)
                 .setFeatures(feats)
-                .setClientProxyUnwrapper(new ClientProxyUnwrapper())
+                .setClientProxyUnwrapper(recorder.clientProxyUnwrapper())
                 .setApplicationSupplier(recorder.handleApplication(applicationClass, singletonClasses.isEmpty()))
                 .setFactoryCreator(recorder.factoryCreator(beanContainerBuildItem.getValue()))
                 .setDynamicFeatures(dynamicFeats)

diff --git a/...e/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ResteasyReactiveRecorder.java b/...e/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ResteasyReactiveRecorder.java
@@ -42,6 +42,7 @@
 import org.jboss.resteasy.reactive.spi.ThreadSetupAction;
 
 import io.quarkus.arc.Arc;
+import io.quarkus.arc.ClientProxy;
 import io.quarkus.arc.runtime.BeanContainer;
 import io.quarkus.resteasy.reactive.common.runtime.ArcBeanFactory;
 import io.quarkus.resteasy.reactive.common.runtime.ArcThreadSetupAction;
@@ -346,6 +347,10 @@ public BeanFactory<?> apply(Class<?> aClass) {
         };
     }
 
+    public Function<Object, Object> clientProxyUnwrapper() {
+        return ClientProxy::unwrap;
+    }
+
     public Supplier<Boolean> disableIfPropertyMatches(String propertyName, String propertyValue, boolean disableIfMissing) {
         return new Supplier<>() {
             @Override