Skip to content

Fix query param in UriBuilder #5445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 20, 2023
Merged

Fix query param in UriBuilder #5445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core-common/src/main/java/org/glassfish/jersey/uri/UriTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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().charAt(0) != '{' || firstQuery != '&')) {
sb.insert(sbLength, '?');
}
}
Expand Down
11 changes: 11 additions & 0 deletions ...rc/test/java/org/glassfish/jersey/tests/e2e/common/uri/internal/JerseyUriBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down