Resolve UriComponentsBuilder argument with contextPath

Closes gh-25822
This commit is contained in:
Rossen Stoyanchev
2020-10-15 22:08:32 +01:00
parent 424e28bc35
commit a2ff139edd
4 changed files with 22 additions and 7 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -111,7 +111,8 @@ public class ServerWebExchangeMethodArgumentResolver extends HandlerMethodArgume
}
else if (UriBuilder.class == paramType || UriComponentsBuilder.class == paramType) {
URI uri = exchange.getRequest().getURI();
return UriComponentsBuilder.fromUri(uri).replacePath(null).replaceQuery(null);
String contextPath = exchange.getRequest().getPath().contextPath().value();
return UriComponentsBuilder.fromUri(uri).replacePath(contextPath).replaceQuery(null);
}
else {
// should never happen...