Properly support generic bounds for ParamConverterProvider classes

Fixes: quarkusio#27892
geoand · Sep 13, 2022 · 31bac22 · 31bac22
1 parent 89fc74f
commit 31bac22
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/.../src/test/java/io/quarkus/resteasy/reactive/server/test/providers/ParamConverterTest.java b/.../src/test/java/io/quarkus/resteasy/reactive/server/test/providers/ParamConverterTest.java
@@ -73,11 +73,11 @@ public String set(@QueryParam("id") Set<UUID> uuids) {
 
         @Path("list")
         @GET
-        public String list(@QueryParam("id") List<UUID> uuids) {
+        public String list(@QueryParam("id") List<? extends UUID> uuids) {
             return join(uuids.stream());
         }
 
-        private static String join(Stream<UUID> uuids) {
+        private static String join(Stream<? extends UUID> uuids) {
             return uuids.map(UUID::toString).collect(Collectors.joining(","));
         }
     }

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
@@ -8,6 +8,7 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
+import java.lang.reflect.WildcardType;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -503,7 +504,26 @@ private static void smartInitParameterConverter(int i, ParameterConverter quarku
             if (genericParameterTypes[i] instanceof ParameterizedType) {
                 Type[] genericArguments = ((ParameterizedType) genericParameterTypes[i]).getActualTypeArguments();
                 if (genericArguments.length == 1) {
-                    quarkusConverter.init(paramConverterProviders, loadClass(genericArguments[0].getTypeName()),
+                    String genericTypeClassName = null;
+                    Type genericType = genericArguments[0];
+                    if (genericType instanceof Class) {
+                        genericTypeClassName = ((Class<?>) genericType).getName();
+                    } else if (genericType instanceof WildcardType) {
+                        WildcardType genericTypeWildcardType = (WildcardType) genericType;
+                        Type[] upperBounds = genericTypeWildcardType.getUpperBounds();
+                        Type[] lowerBounds = genericTypeWildcardType.getLowerBounds();
+                        if ((lowerBounds.length == 0) && (upperBounds.length == 1)) {
+                            Type genericTypeUpperBoundType = upperBounds[0];
+                            if (genericTypeUpperBoundType instanceof Class) {
+                                genericTypeClassName = ((Class<?>) genericTypeUpperBoundType).getName();
+                            }
+                        }
+                    }
+                    if (genericTypeClassName == null) {
+                        throw new IllegalArgumentException(
+                                "Unable to support parameter converter with type: '" + genericType.getTypeName() + "'");
+                    }
+                    quarkusConverter.init(paramConverterProviders, loadClass(genericTypeClassName),
                             genericArguments[0],
                             parameterAnnotations[i]);
                     return;