Merge pull request #14356 from geoand/#14348

Use Dotname instead of Type to determine @BeanParam class target
quarkusio · Jan 18, 2021 · f60af75 · f60af75
2 parents 5018a9f + 3fe3c8e
commit f60af75
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/...t/java/io/quarkus/resteasy/reactive/server/test/simple/FieldInjectedSubClassResource.java b/...t/java/io/quarkus/resteasy/reactive/server/test/simple/FieldInjectedSubClassResource.java
@@ -1,5 +1,6 @@
 package io.quarkus.resteasy.reactive.server.test.simple;
 
+import javax.validation.constraints.NotNull;
 import javax.ws.rs.BeanParam;
 import javax.ws.rs.GET;
 import javax.ws.rs.HeaderParam;
@@ -45,7 +46,7 @@ private void checkInjections(String path, String query, String header, UriInfo u
     public String param(@QueryParam("query") String query,
             @HeaderParam("header") String header,
             @Context UriInfo uriInfo,
-            @BeanParam BeanParamSubClass beanParam) {
+            @BeanParam @NotNull BeanParamSubClass beanParam) {
         checkInjections("/injection-subclass/param2", query, header, uriInfo, this.beanParam, query, uriInfo, beanParam);
         return "OK";
     }

diff --git a/...n/java/org/jboss/resteasy/reactive/common/processor/scanning/ResteasyReactiveScanner.java b/...n/java/org/jboss/resteasy/reactive/common/processor/scanning/ResteasyReactiveScanner.java
@@ -121,17 +121,17 @@ public static ResourceScanningResult scanResources(
             // FIXME: this isn't right wrt generics
             switch (target.kind()) {
                 case FIELD:
-                    beanParams.add(target.asField().type().toString());
+                    beanParams.add(target.asField().type().name().toString());
                     break;
                 case METHOD:
                     Type setterParamType = target.asMethod().parameters().get(0);
-                    beanParams.add(setterParamType.toString());
+                    beanParams.add(setterParamType.name().toString());
                     break;
                 case METHOD_PARAMETER:
                     MethodInfo method = target.asMethodParameter().method();
                     int paramIndex = target.asMethodParameter().position();
                     Type paramType = method.parameters().get(paramIndex);
-                    beanParams.add(paramType.toString());
+                    beanParams.add(paramType.name().toString());
                     break;
                 default:
                     break;