Fix query param in UriBuilder

Signed-off-by: jansupol <jan.supol@oracle.com>
eclipse-ee4j · Oct 19, 2023 · cd910d7 · cd910d7
1 parent ab217b3
commit cd910d7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/core-common/src/main/java/org/glassfish/jersey/uri/UriTemplate.java b/core-common/src/main/java/org/glassfish/jersey/uri/UriTemplate.java
@@ -887,7 +887,7 @@ private static String createURI(
                         offset, encode, mapValues, sb);
                 if (sb.length() > sbLength) {
                     char firstQuery = sb.charAt(sbLength);
-                    if (firstQuery != '?' && firstQuery != '&') {
+                    if (firstQuery != '?' && (!query.trim().startsWith("{") || firstQuery != '&')) {
                         sb.insert(sbLength, '?');
                     }
                 }

diff --git a/...rc/test/java/org/glassfish/jersey/tests/e2e/common/uri/internal/JerseyUriBuilderTest.java b/...rc/test/java/org/glassfish/jersey/tests/e2e/common/uri/internal/JerseyUriBuilderTest.java
@@ -1659,6 +1659,17 @@ public void testQueryParamStyleMultiPairs() {
                          "key1=val1&key1=val2&key2=val1&key1=val3");
     }
 
+
+    @Test
+    public void testQueryParam() {
+        URI uri = new JerseyUriBuilder().scheme("http").host("localhost").port(8080).uri("some")
+                    .replacePath("NewPath")
+                    .replaceQuery("&Second")
+                    .build();
+        Assertions.assertEquals("&Second", uri.getQuery());
+    }
+
+
     @Test
     void testFragment5269() throws URISyntaxException {
         final URI uri = new URI("http://www.example.org/foo.xml#xpointer(//Rube)").normalize();