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

Polish

Browse Source 
Issue: SPR-10539
This commit is contained in:
Rossen Stoyanchev
2013-09-25 12:47:50 -04:00
parent 2dd4480103
commit 92795f463a
5 changed files with 37 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java
View File

@@ -182,12 +182,7 @@ final class HierarchicalUriComponents extends UriComponents {
}
String encodedScheme = encodeUriComponent(this.getScheme(), encoding, Type.SCHEME);
String encodedUserInfo = encodeUriComponent(this.userInfo, encoding, Type.USER_INFO);
String encodedHost;
if(StringUtils.hasLength(this.host) && this.host.startsWith("[")) {
encodedHost = encodeUriComponent(this.host, encoding, Type.HOST_IPV6);
} else {
encodedHost = encodeUriComponent(this.host, encoding, Type.HOST);
}
String encodedHost = encodeUriComponent(this.host, encoding, getHostType());
PathComponent encodedPath = this.path.encode(encoding);
MultiValueMap<String, String> encodedQueryParams =
@@ -246,6 +241,9 @@ final class HierarchicalUriComponents extends UriComponents {
return bos.toByteArray();
}
private Type getHostType() {
return ((this.host != null) && this.host.startsWith("[")) ? Type.HOST_IPV6 : Type.HOST_IPV4;
}
// verifying
@@ -260,7 +258,7 @@ final class HierarchicalUriComponents extends UriComponents {
}
verifyUriComponent(getScheme(), Type.SCHEME);
verifyUriComponent(userInfo, Type.USER_INFO);
verifyUriComponent(host, Type.HOST);
verifyUriComponent(host, getHostType());
this.path.verify();
for (Map.Entry<String, List<String>> entry : queryParams.entrySet()) {
verifyUriComponent(entry.getKey(), Type.QUERY_PARAM);
@@ -468,7 +466,7 @@ final class HierarchicalUriComponents extends UriComponents {
return isUnreserved(c) || isSubDelimiter(c) || ':' == c;
}
},
HOST {
HOST_IPV4 {
@Override
public boolean isAllowed(int c) {
return isUnreserved(c) || isSubDelimiter(c);

4
spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java
View File

@@ -64,11 +64,11 @@ public class UriComponentsBuilder {
private static final String USERINFO_PATTERN = "([^@/]*)";
private static final String HOST_IPv4_PATTERN = "[^\\[/?#:]*";
private static final String HOST_IPV4_PATTERN = "[^\\[/?#:]*";
private static final String HOST_IPV6_PATTERN = "\\[[\\p{XDigit}\\:\\.]*[%\\p{Alnum}]*\\]";
private static final String HOST_PATTERN = "("+HOST_IPV6_PATTERN + "|" + HOST_IPv4_PATTERN + ")";
private static final String HOST_PATTERN = "(" + HOST_IPV6_PATTERN + "|" + HOST_IPV4_PATTERN + ")";
private static final String PORT_PATTERN = "(\\d*)";

2
spring-web/src/main/java/org/springframework/web/util/UriUtils.java
View File

@@ -254,7 +254,7 @@ public abstract class UriUtils {
*/
public static String encodeHost(String host, String encoding) throws UnsupportedEncodingException {
return HierarchicalUriComponents
.encodeUriComponent(host, encoding, HierarchicalUriComponents.Type.HOST);
.encodeUriComponent(host, encoding, HierarchicalUriComponents.Type.HOST_IPV4);
}
/**