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

SPR-5973: Using UriComponents in more places, replaced UriBuilder by UriComponentsBuilder, UriComponents is now immutable.

Browse Source
This commit is contained in:
Arjen Poutsma
2011-09-12 14:39:58 +00:00
parent ce8bc8e7e4
commit c8add61a72
12 changed files with 1344 additions and 1644 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/ServletUriBuilder.java → org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/ServletUriComponentsBuilder.java
View File

@@ -22,13 +22,13 @@ import org.springframework.util.Assert;
import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import org.springframework.web.util.UriBuilder;
import org.springframework.web.util.UriComponentsBuilder;
/** @author Arjen Poutsma */
public class ServletUriBuilder extends UriBuilder {
public class ServletUriComponentsBuilder extends UriComponentsBuilder {
public static ServletUriBuilder fromCurrentServletRequest() {
public static ServletUriComponentsBuilder fromCurrentServletRequest() {
RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
Assert.state(requestAttributes != null, "Could not find current RequestAttributes in RequestContextHolder");
Assert.isInstanceOf(ServletRequestAttributes.class, requestAttributes);
@@ -38,10 +38,10 @@ public class ServletUriBuilder extends UriBuilder {
return fromServletRequest(servletRequest);
}
public static ServletUriBuilder fromServletRequest(HttpServletRequest request) {
public static ServletUriComponentsBuilder fromServletRequest(HttpServletRequest request) {
Assert.notNull(request, "'request' must not be null");
ServletUriBuilder builder = new ServletUriBuilder();
ServletUriComponentsBuilder builder = new ServletUriComponentsBuilder();
builder.scheme(request.getScheme());
builder.host(request.getServerName());
builder.port(request.getServerPort());