Skip to content

Error in RequestTemplate#uri when there're both query and fragment #2367

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
Apr 2, 2024
Merged

Error in RequestTemplate#uri when there're both query and fragment #2367

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
12 changes: 6 additions & 6 deletions core/src/main/java/feign/RequestTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,12 @@ public RequestTemplate uri(String uri, boolean append) {
uri = "/" + uri;
}

int fragmentIndex = uri.indexOf('#');
if (fragmentIndex > -1) {
fragment = uri.substring(fragmentIndex);
uri = uri.substring(0, fragmentIndex);
}

/*
* templates may provide query parameters. since we want to manage those explicity, we will need
* to extract those out, leaving the uriTemplate with only the path to deal with.
Expand All @@ -472,12 +478,6 @@ public RequestTemplate uri(String uri, boolean append) {
uri = uri.substring(0, queryMatcher.start());
}

int fragmentIndex = uri.indexOf('#');
if (fragmentIndex > -1) {
fragment = uri.substring(fragmentIndex);
uri = uri.substring(0, fragmentIndex);
}

/* replace the uri template */
if (append && this.uriTemplate != null) {
this.uriTemplate = UriTemplate.append(this.uriTemplate, uri);
Expand Down
10 changes: 10 additions & 0 deletions core/src/test/java/feign/RequestTemplateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,16 @@ void fragmentShouldNotBeEncodedInTarget() {
assertThat(template.url()).isEqualTo("https://example.com/path?key1=value1#fragment");
}

@Test
void fragmentShouldBeExtractedWhenQueryParamsExist() {
RequestTemplate template =
new RequestTemplate().method(HttpMethod.GET).uri("/path?query=queryValue#fragment",
true);

assertThat(template.url()).isEqualTo("/path?query=queryValue#fragment");
assertThat(template.queryLine()).isEqualTo("?query=queryValue");
}

@Test
void urlEncodingRemainsInPlace() {
RequestTemplate template = new RequestTemplate().method(HttpMethod.GET)
Expand Down