Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify the calculation of UndertowServerHttpRequest.uri

Browse Source
This commit is contained in:
Violeta Georgieva
2017-02-06 20:09:59 +02:00
committed by Rossen Stoyanchev
parent 9efa976d31
commit 706c72e1c7
1 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-web/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpRequest.java
View File

@@ -19,7 +19,6 @@ package org.springframework.http.server.reactive;
import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.URI;
import java.net.URISyntaxException;
import java.nio.ByteBuffer;
import java.util.Optional;
@@ -65,23 +64,10 @@ public class UndertowServerHttpRequest extends AbstractServerHttpRequest {
private static URI initUri(HttpServerExchange exchange) {
Assert.notNull(exchange, "HttpServerExchange is required.");
String requestURI = exchange.getRequestURI();
String requestURL = exchange.getRequestURL();
String query = exchange.getQueryString();
String requestUriAndQuery = StringUtils.isEmpty(query) ? requestURI : requestURI + "?" + query;
return (exchange.isHostIncludedInRequestURI()) ?
URI.create(requestUriAndQuery) : getBaseUri(exchange).resolve(requestUriAndQuery);
}
private static URI getBaseUri(HttpServerExchange exchange) {
try {
String scheme = exchange.getRequestScheme();
String host = exchange.getHostName();
int port = exchange.getHostPort();
return new URI(scheme, null, host, port, null, null, null);
}
catch (URISyntaxException ex) {
throw new IllegalStateException("Could not get URI: " + ex.getMessage(), ex);
}
String requestUriAndQuery = StringUtils.isEmpty(query) ? requestURL : requestURL + "?" + query;
return URI.create(requestUriAndQuery);
}
private static HttpHeaders initHeaders(HttpServerExchange exchange) {