Replace useless DynamicFeatureResourceInfo class with ResteasyReactiv…

…eResourceInfo Fixes: quarkusio#13981
geoand · Dec 19, 2020 · 1854d37 · 1854d37
1 parent 1a83ef7
commit 1854d37
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 77 deletions.
diff --git a/.../main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeResourceDeployment.java b/.../main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeResourceDeployment.java
@@ -109,8 +109,7 @@ public RuntimeResourceDeployment(DeploymentInfo info, Supplier<Executor> executo
 
     public RuntimeResource buildResourceMethod(ResourceClass clazz,
             ServerResourceMethod method, boolean locatableResource, URITemplate classPathTemplate) {
-        RuntimeInterceptorDeployment.MethodInterceptorContext interceptorDeployment = runtimeInterceptorDeployment
-                .forMethod(clazz, method);
+
         URITemplate methodPathTemplate = new URITemplate(method.getPath(), false);
         List<ServerRestHandler> abortHandlingChain = new ArrayList<>();
         MultivaluedMap<ScoreSystem.Category, ScoreSystem.Diagnostic> score = new QuarkusMultivaluedHashMap<>();
@@ -131,6 +130,17 @@ public RuntimeResource buildResourceMethod(ResourceClass clazz,
             }
         }
 
+        Class<Object> resourceClass = loadClass(clazz.getClassName());
+        Class<?>[] parameterClasses = new Class[method.getParameters().length];
+        for (int i = 0; i < method.getParameters().length; ++i) {
+            parameterClasses[i] = loadClass(method.getParameters()[i].declaredType);
+        }
+        ResteasyReactiveResourceInfo lazyMethod = new ResteasyReactiveResourceInfo(method.getName(), resourceClass,
+                parameterClasses, method.getMethodAnnotationNames());
+
+        RuntimeInterceptorDeployment.MethodInterceptorContext interceptorDeployment = runtimeInterceptorDeployment
+                .forMethod(method, lazyMethod);
+
         //setup reader and writer interceptors first
         handlers.addAll(interceptorDeployment.setupInterceptorHandler());
         //at this point the handler chain only has interceptors
@@ -188,14 +198,6 @@ public RuntimeResource buildResourceMethod(ResourceClass clazz,
             }
         }
 
-        Class<Object> resourceClass = loadClass(clazz.getClassName());
-        Class<?>[] parameterClasses = new Class[method.getParameters().length];
-        for (int i = 0; i < method.getParameters().length; ++i) {
-            parameterClasses[i] = loadClass(method.getParameters()[i].declaredType);
-        }
-        ResteasyReactiveResourceInfo lazyMethod = new ResteasyReactiveResourceInfo(method.getName(), resourceClass,
-                parameterClasses, method.getMethodAnnotationNames());
-
         for (int i = 0; i < parameters.length; i++) {
             ServerMethodParameter param = (ServerMethodParameter) parameters[i];
             boolean single = param.isSingle();

diff --git a/...me/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/DynamicFeatureResourceInfo.java b/...me/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/DynamicFeatureResourceInfo.java