Skip to content

[backport camel-4.18.x] CAMEL-23698: Do not append trailing ? to URI when query string is empty #23801

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
davsclaus merged 1 commit into from
Jun 5, 2026
+9 −1
Merged

[backport camel-4.18.x] CAMEL-23698: Do not append trailing ? to URI when query string is empty #23801

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/camel-util/src/main/java/org/apache/camel/util/URISupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ public static URI createURIWithQuery(URI uri, String query) throws URISyntaxExce
if (before != null) {
s = before;
}
if (query != null) {
if (query != null && !query.isEmpty()) {
s = s + "?" + query;
}
if (!s.contains("#") && uri.getFragment() != null) {
Expand Down
8 changes: 8 additions & 0 deletions core/camel-util/src/test/java/org/apache/camel/util/URISupportTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,14 @@ public void testCreateURIWithQueryHasOneFragmentAndQueryParameter() throws Excep
assertEquals("smtp://localhost?utm_campaign=launch#fragmentOne", resultUri.toString());
}

@Test
public void testCreateURIWithQueryEmptyQueryString() throws Exception {
URI uri = new URI("https://api.example.com/users/myuser/repos");
URI resultUri = URISupport.createURIWithQuery(uri, "");
assertNotNull(resultUri);
assertEquals("https://api.example.com/users/myuser/repos", resultUri.toString());
}

@Test
public void testNormalizeEndpointWithEqualSignInParameter() throws Exception {
String out = URISupport.normalizeUri("jms:queue:foo?selector=somekey='somevalue'&foo=bar");
Expand Down
Loading