Allow UriTemplate to be built with an empty template

See gh-32432
spring-projects · Mar 13, 2024 · 1b25a15 · 1b25a15
1 parent 723c94e
commit 1b25a15
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java b/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java
@@ -66,7 +66,7 @@ public class UriTemplate implements Serializable {
 	 * @param uriTemplate the URI template string
 	 */
 	public UriTemplate(String uriTemplate) {
-		Assert.hasText(uriTemplate, "'uriTemplate' must not be null");
+		Assert.notNull(uriTemplate, "'uriTemplate' must not be null");
 		this.uriTemplate = uriTemplate;
 		this.uriComponents = UriComponentsBuilder.fromUriString(uriTemplate).build();
 

diff --git a/spring-web/src/test/java/org/springframework/web/util/UriTemplateTests.java b/spring-web/src/test/java/org/springframework/web/util/UriTemplateTests.java
@@ -27,6 +27,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
+import static org.assertj.core.api.Assertions.assertThatNoException;
 
 /**
  * @author Arjen Poutsma
@@ -218,4 +219,14 @@ void expandWithAtSign() {
 		assertThat(uri.toString()).isEqualTo("http://localhost/query=foo@bar");
 	}
 
+	@Test
+	void emptyPathDoesNotThrowException() {
+		assertThatNoException().isThrownBy(() -> new UriTemplate(""));
+	}
+
+	@Test
+	void emptyPathThrowsException() {
+		assertThatIllegalArgumentException().isThrownBy(() -> new UriTemplate(null));
+	}
+
 }