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

Revised UriComponentsBuilder assertions

Browse Source 
Issue: SPR-13257
This commit is contained in:
Juergen Hoeller
2015-07-29 12:39:41 +02:00
parent 291550a484
commit e1a0c50046
2 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -183,7 +183,7 @@ public class UriComponentsBuilder implements Cloneable {
* @return the new {@code UriComponentsBuilder}
*/
public static UriComponentsBuilder fromUriString(String uri) {
Assert.notNull(uri, "'uri' must not be null");
Assert.notNull(uri, "URI must not be null");
Matcher matcher = URI_PATTERN.matcher(uri);
if (matcher.matches()) {
UriComponentsBuilder builder = new UriComponentsBuilder();
@@ -243,7 +243,7 @@ public class UriComponentsBuilder implements Cloneable {
* @return the URI components of the URI
*/
public static UriComponentsBuilder fromHttpUrl(String httpUrl) {
Assert.notNull(httpUrl, "'httpUrl' must not be null");
Assert.notNull(httpUrl, "HTTP URL must not be null");
Matcher matcher = HTTP_URL_PATTERN.matcher(httpUrl);
if (matcher.matches()) {
UriComponentsBuilder builder = new UriComponentsBuilder();
@@ -429,7 +429,7 @@ public class UriComponentsBuilder implements Cloneable {
* @return this UriComponentsBuilder
*/
public UriComponentsBuilder uri(URI uri) {
Assert.notNull(uri, "'uri' must not be null");
Assert.notNull(uri, "URI must not be null");
this.scheme = uri.getScheme();
if (uri.isOpaque()) {
this.ssp = uri.getRawSchemeSpecificPart();
@@ -489,7 +489,7 @@ public class UriComponentsBuilder implements Cloneable {
* @return this UriComponentsBuilder
*/
public UriComponentsBuilder uriComponents(UriComponents uriComponents) {
Assert.notNull(uriComponents, "'uriComponents' must not be null");
Assert.notNull(uriComponents, "UriComponents must not be null");
uriComponents.copyToUriComponentsBuilder(this);
return this;
}
@@ -538,7 +538,7 @@ public class UriComponentsBuilder implements Cloneable {
* @return this UriComponentsBuilder
*/
public UriComponentsBuilder port(int port) {
Assert.isTrue(port >= -1, "'port' must not be < -1");
Assert.isTrue(port >= -1, "Port must be >= -1");
this.port = String.valueOf(port);
resetSchemeSpecificPart();
return this;
@@ -587,7 +587,6 @@ public class UriComponentsBuilder implements Cloneable {
* @return this UriComponentsBuilder
*/
public UriComponentsBuilder pathSegment(String... pathSegments) throws IllegalArgumentException {
Assert.notNull(pathSegments, "'segments' must not be null");
this.pathBuilder.addPathSegments(pathSegments);
resetSchemeSpecificPart();
return this;
@@ -647,7 +646,7 @@ public class UriComponentsBuilder implements Cloneable {
* @return this UriComponentsBuilder
*/
public UriComponentsBuilder queryParam(String name, Object... values) {
Assert.notNull(name, "'name' must not be null");
Assert.notNull(name, "Name must not be null");
if (!ObjectUtils.isEmpty(values)) {
for (Object value : values) {
String valueAsString = (value != null ? value.toString() : null);
@@ -667,8 +666,9 @@ public class UriComponentsBuilder implements Cloneable {
* @return this UriComponentsBuilder
*/
public UriComponentsBuilder queryParams(MultiValueMap<String, String> params) {
Assert.notNull(params, "'params' must not be null");
this.queryParams.putAll(params);
if (params != null) {
this.queryParams.putAll(params);
}
return this;
}
@@ -680,7 +680,7 @@ public class UriComponentsBuilder implements Cloneable {
* @return this UriComponentsBuilder
*/
public UriComponentsBuilder replaceQueryParam(String name, Object... values) {
Assert.notNull(name, "'name' must not be null");
Assert.notNull(name, "Name must not be null");
this.queryParams.remove(name);
if (!ObjectUtils.isEmpty(values)) {
queryParam(name, values);
@@ -695,9 +695,10 @@ public class UriComponentsBuilder implements Cloneable {
* @return this UriComponentsBuilder
*/
public UriComponentsBuilder replaceQueryParams(MultiValueMap<String, String> params) {
Assert.notNull(params, "'params' must not be null");
this.queryParams.clear();
this.queryParams.putAll(params);
if (params != null) {
this.queryParams.putAll(params);
}
return this;
}
@@ -709,7 +710,7 @@ public class UriComponentsBuilder implements Cloneable {
*/
public UriComponentsBuilder fragment(String fragment) {
if (fragment != null) {
Assert.hasLength(fragment, "'fragment' must not be empty");
Assert.hasLength(fragment, "Fragment must not be empty");
this.fragment = fragment;
}
else {

14
spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java
View File

@@ -16,9 +16,6 @@
package org.springframework.web.util;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Arrays;
@@ -35,12 +32,16 @@ import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.util.StringUtils;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
/**
* Unit tests for {@link org.springframework.web.util.UriComponentsBuilder}.
*
* @author Arjen Poutsma
* @author Phillip Webb
* @author Oliver Gierke
* @author David Eckel
*/
public class UriComponentsBuilderTests {
@@ -650,6 +651,12 @@ public class UriComponentsBuilderTests {
assertThat(components.toString(), equalTo("/example"));
}
@Test // SPR-13257
public void parsesEmptyUri() {
UriComponents components = UriComponentsBuilder.fromUriString("").build();
assertThat(components.toString(), equalTo(""));
}
@Test
public void testClone() throws URISyntaxException {
UriComponentsBuilder builder1 = UriComponentsBuilder.newInstance();
@@ -740,5 +747,4 @@ public class UriComponentsBuilderTests {
assertEquals("/rest/mobile/users/1", result.getPath());
}
}