Merge pull request #24549 from geoand/#24541

Properly handle char and Character parameter types in JAX-RS methods
quarkusio · Mar 29, 2022 · 850908a · 850908a
2 parents b31e400 + 18a6af3
commit 850908a
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 2 deletions.
diff --git a/...sor/src/main/java/org/jboss/resteasy/reactive/server/processor/ServerEndpointIndexer.java b/...sor/src/main/java/org/jboss/resteasy/reactive/server/processor/ServerEndpointIndexer.java
@@ -54,6 +54,8 @@
 import org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames;
 import org.jboss.resteasy.reactive.common.processor.transformation.AnnotationStore;
 import org.jboss.resteasy.reactive.server.core.parameters.ParameterExtractor;
+import org.jboss.resteasy.reactive.server.core.parameters.converters.CharParamConverter;
+import org.jboss.resteasy.reactive.server.core.parameters.converters.CharacterParamConverter;
 import org.jboss.resteasy.reactive.server.core.parameters.converters.ListConverter;
 import org.jboss.resteasy.reactive.server.core.parameters.converters.LoadedParameterConverter;
 import org.jboss.resteasy.reactive.server.core.parameters.converters.LocalDateParamConverter;
@@ -472,6 +474,10 @@ private ParameterConverterSupplier extractConverter(String elementType, IndexVie
             return delegate;
         } else if (elementType.equals(PathSegment.class.getName())) {
             return new PathSegmentParamConverter.Supplier();
+        } else if (elementType.equals("char")) {
+            return new CharParamConverter.Supplier();
+        } else if (elementType.equals(Character.class.getName())) {
+            return new CharacterParamConverter.Supplier();
         }
         return converterSupplierIndexerExtension.extractConverterImpl(elementType, indexView, existingConverters, errorLocation,
                 hasRuntimeConverters);

diff --git a/...ava/org/jboss/resteasy/reactive/server/core/parameters/converters/CharParamConverter.java b/...ava/org/jboss/resteasy/reactive/server/core/parameters/converters/CharParamConverter.java
@@ -0,0 +1,26 @@
+package org.jboss.resteasy.reactive.server.core.parameters.converters;
+
+public class CharParamConverter implements ParameterConverter {
+
+    @Override
+    public Object convert(Object parameter) {
+        String str = parameter.toString();
+        if (str.length() != 1) {
+            throw new IllegalArgumentException("invalid char value: " + str);
+        }
+        return str.charAt(0);
+    }
+
+    public static class Supplier implements ParameterConverterSupplier {
+
+        @Override
+        public String getClassName() {
+            return CharParamConverter.class.getName();
+        }
+
+        @Override
+        public CharParamConverter get() {
+            return new CharParamConverter();
+        }
+    }
+}
diff --git a/...rg/jboss/resteasy/reactive/server/core/parameters/converters/CharacterParamConverter.java b/...rg/jboss/resteasy/reactive/server/core/parameters/converters/CharacterParamConverter.java
@@ -0,0 +1,26 @@
+package org.jboss.resteasy.reactive.server.core.parameters.converters;
+
+public class CharacterParamConverter implements ParameterConverter {
+
+    @Override
+    public Object convert(Object parameter) {
+        String str = parameter.toString();
+        if (str.length() != 1) {
+            throw new IllegalArgumentException("invalid Character value: " + str);
+        }
+        return Character.valueOf(str.charAt(0));
+    }
+
+    public static class Supplier implements ParameterConverterSupplier {
+
+        @Override
+        public String getClassName() {
+            return CharacterParamConverter.class.getName();
+        }
+
+        @Override
+        public CharacterParamConverter get() {
+            return new CharacterParamConverter();
+        }
+    }
+}
diff --git a/.../java/org/jboss/resteasy/reactive/server/vertx/test/simple/SimpleQuarkusRestResource.java b/.../java/org/jboss/resteasy/reactive/server/vertx/test/simple/SimpleQuarkusRestResource.java
@@ -75,8 +75,10 @@ public String get(@PathParam("id") String id) {
     public String params(@PathParam("p") String p,
             @QueryParam("q") String q,
             @HeaderParam("h") int h,
+            @HeaderParam("h2") char h2,
+            @HeaderParam("h3") Character h3,
             @FormParam("f") String f) {
-        return "params: p: " + p + ", q: " + q + ", h: " + h + ", f: " + f;
+        return "params: p: " + p + ", q: " + q + ", h: " + h + ", h2: " + h2 + ", h3: " + h3 + ", f: " + f;
     }
 
     @POST

diff --git a/.../java/org/jboss/resteasy/reactive/server/vertx/test/simple/SimpleQuarkusRestTestCase.java b/.../java/org/jboss/resteasy/reactive/server/vertx/test/simple/SimpleQuarkusRestTestCase.java
@@ -109,9 +109,11 @@ public void testParams() {
         RestAssured.with()
                 .queryParam("q", "qv")
                 .header("h", "123")
+                .header("h2", "a")
+                .header("h3", "b")
                 .formParam("f", "fv")
                 .post("/simple/params/pv")
-                .then().body(Matchers.equalTo("params: p: pv, q: qv, h: 123, f: fv"));
+                .then().statusCode(200).body(Matchers.equalTo("params: p: pv, q: qv, h: 123, h2: a, h3: b, f: fv"));
     }
 
     @Test