Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 16 additions & 0 deletions core/src/main/java/feign/RequestTemplate.java
Original file line number Diff line number Diff line change
Expand Up @@ -575,6 +575,22 @@ public String path() {
return path.toString();
}

/**
* The Uri Template (relative path) without the host and port. This is the templated path with
* parameter placeholders but without the scheme://host:port prefix.
*
* <p>For example, given a target of {@code https://api.example.com:8443} and a uri of {@code
* /v1/api/resource/{id}}, this method will return {@code /v1/api/resource/{id}}.
*
* @return the uri template path without host/port, or "/" if no path is set
*/
public String requestUriTemplate() {
if (this.uriTemplate != null) {
return this.uriTemplate.toString();
}
return "/";
}

/**
* List all of the template variable expressions for this template.
*
Expand Down
33 changes: 33 additions & 0 deletions core/src/test/java/feign/RequestTemplateTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -599,4 +599,37 @@ void nullValuesOfHeaderShouldBeHandled() {
String name = "";
template.header(name, values);
}

@Test
void requestUriTemplateReturnsPathWithoutHost() {
RequestTemplate template = new RequestTemplate();
template.target("https://api.example.com:8443");
template.uri("/v1/api/resource/{id}");
assertThat(template.requestUriTemplate()).isEqualTo("/v1/api/resource/{id}");
}

@Test
void requestUriTemplateWithMultiplePathSegments() {
RequestTemplate template = new RequestTemplate();
template.target("https://api.example.com:8443");
template.uri("/api/v1/users/{userId}/posts/{postId}");
assertThat(template.requestUriTemplate()).isEqualTo("/api/v1/users/{userId}/posts/{postId}");
}

@Test
void requestUriTemplateReturnsRootPathWhenNotSet() {
RequestTemplate template = new RequestTemplate();
assertThat(template.requestUriTemplate()).isEqualTo("/");
}

@Test
void requestUriTemplateDoesNotIncludeQueries() {
RequestTemplate template = new RequestTemplate();
template.uri("/resource?filter={filter}&sort={sort}");
assertThat(template.requestUriTemplate()).isEqualTo("/resource");
assertThat(template)
.hasQueries(
entry("filter", Collections.singletonList("{filter}")),
entry("sort", Collections.singletonList("{sort}")));
}
}