root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Resolve baseUrl to String vs temporary URI 

Along the lines of what was suggested in #30047.

Closes gh-30062
This commit is contained in:
rstoyanchev 2023-03-02 10:17:44 +00:00
parent 682a4d5353
commit 9624ea392a
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java
View File

@ -76,17 +76,15 @@ class ReactorServerHttpRequest extends AbstractServerHttpRequest {
return new URI(resolveBaseUrl(request) + resolveRequestUri(request)); return new URI(resolveBaseUrl(request) + resolveRequestUri(request));
} }
private static URI resolveBaseUrl(HttpServerRequest request) throws URISyntaxException { private static String resolveBaseUrl(HttpServerRequest request) {
String scheme = getScheme(request); String scheme = request.scheme();
int port = request.hostPort(); int port = request.hostPort();
return ((scheme.equals("http") || scheme.equals("ws")) && (port != 80)) || return scheme + "://" + request.hostName() + (usePort(scheme, port) ? ":" + port : "");
((scheme.equals("https") || scheme.equals("wss")) && (port != 443)) ?
new URI(scheme, null, request.hostName(), port, null, null, null) :
new URI(scheme, request.hostName(), null, null);
} }
private static String getScheme(HttpServerRequest request) { private static boolean usePort(String scheme, int port) {
return request.scheme(); return ((scheme.equals("http") || scheme.equals("ws")) && (port != 80)) ||
((scheme.equals("https") || scheme.equals("wss")) && (port != 443));
} }
private static String resolveRequestUri(HttpServerRequest request) { private static String resolveRequestUri(HttpServerRequest request) {