Do not append single '&' with empty query params in Resteasy Reactive

Fix quarkusio#31249
gsmet · Feb 28, 2023 · de389aa · de389aa
1 parent 042a965
commit de389aa
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/...t/java/io/quarkus/jaxrs/client/reactive/deployment/test/QueryParamNoTemplateTestCase.java b/...t/java/io/quarkus/jaxrs/client/reactive/deployment/test/QueryParamNoTemplateTestCase.java
@@ -54,6 +54,20 @@ public void testInjection() {
         Assertions.assertEquals("%FF,{foo&bar}", data);
     }
 
+    @Test
+    public void testEmptyQueryParam() {
+        Object data = client.target(url.toExternalForm() + "/absoluteURI")
+                // Empty query param should be omitted in the generated URI
+                .queryParam("empty")
+                .queryParam("param", "a")
+                .request()
+                .rx(UniInvoker.class)
+                .get()
+                .await()
+                .indefinitely();
+        Assertions.assertEquals("http://localhost:8081//absoluteURI?param=a", data);
+    }
+
     public static class Endpoint {
 
         public void setup(@Observes Router router) {
@@ -68,6 +82,12 @@ public void handle(RoutingContext event) {
                                             .collect(Collectors.joining(",")));
                 }
             });
+            router.route("/absoluteURI").handler(new Handler<RoutingContext>() {
+                @Override
+                public void handle(RoutingContext event) {
+                    event.response().end(event.request().absoluteURI());
+                }
+            });
         }
 
     }

diff --git a/...e/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/WebTargetImpl.java b/...e/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/WebTargetImpl.java
@@ -237,14 +237,14 @@ public WebTargetImpl queryParam(String name, Object... values) throws NullPointe
         UriBuilder copy = uriBuilder.clone();
         if (copy instanceof UriBuilderImpl) {
             var impl = (UriBuilderImpl) copy;
-            if (values == null || (values.length == 1 && values[0] == null)) {
+            if (values == null || values.length == 0 || (values.length == 1 && values[0] == null)) {
                 impl.replaceQueryParam(name, (Object[]) null);
             } else {
                 String[] stringValues = toStringValues(values);
                 impl.clientQueryParam(name, (Object[]) stringValues);
             }
         } else {
-            if (values == null || (values.length == 1 && values[0] == null)) {
+            if (values == null || values.length == 0 || (values.length == 1 && values[0] == null)) {
                 copy.replaceQueryParam(name, (Object[]) null);
             } else {
                 String[] stringValues = toStringValues(values);