2531 HateoasSortHandlerMethodArgumentResolver should append * to the …

…'sort' parameter template variable Fixing tests
Cosium · Sep 28, 2023 · fc4f42f · fc4f42f
1 parent 4100df6
commit fc4f42f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/...a/org/springframework/data/web/HateoasPageableHandlerMethodArgumentResolverUnitTests.java b/...a/org/springframework/data/web/HateoasPageableHandlerMethodArgumentResolverUnitTests.java
@@ -73,10 +73,10 @@ void preventsPageSizeFromExceedingMayValueIfConfiguredOnWrite() throws Exception
 	@Test // DATACMNS-418
 	void appendsTemplateVariablesCorrectly() {
 
-		assertTemplateEnrichment("/foo", "{?page,size,sort}");
-		assertTemplateEnrichment("/foo?bar=1", "{&page,size,sort}");
-		assertTemplateEnrichment("/foo?page=1", "{&size,sort}");
-		assertTemplateEnrichment("/foo?page=1&size=10", "{&sort}");
+		assertTemplateEnrichment("/foo", "{?page,size,sort*}");
+		assertTemplateEnrichment("/foo?bar=1", "{&page,size,sort*}");
+		assertTemplateEnrichment("/foo?page=1", "{&size,sort*}");
+		assertTemplateEnrichment("/foo?page=1&size=10", "{&sort*}");
 		assertTemplateEnrichment("/foo?page=1&sort=foo,asc", "{&size}");
 		assertTemplateEnrichment("/foo?page=1&size=10&sort=foo,asc", "");
 	}
@@ -90,7 +90,7 @@ void returnsCustomizedTemplateVariables() {
 		resolver.setPageParameterName("foo");
 		var variables = resolver.getPaginationTemplateVariables(null, uriComponents).toString();
 
-		assertThat(variables).isEqualTo("{?foo,size,sort}");
+		assertThat(variables).isEqualTo("{?foo,size,sort*}");
 	}
 
 	@Test // DATACMNS-563
@@ -128,7 +128,7 @@ void enhanceTemplateVariables() {
 		resolver.setPageParameterName("foo");
 		String variables = resolver.enhance(TemplateVariables.NONE, uriComponents, null).toString();
 
-		assertThat(variables).isEqualTo("{?foo,size,sort}");
+		assertThat(variables).isEqualTo("{?foo,size,sort*}");
 	}
 
 	@Override

diff --git a/.../java/org/springframework/data/web/HateoasSortHandlerMethodArgumentResolverUnitTests.java b/.../java/org/springframework/data/web/HateoasSortHandlerMethodArgumentResolverUnitTests.java
@@ -56,7 +56,7 @@ void returnCorrectTemplateVariables() {
 		var uriComponents = UriComponentsBuilder.fromPath("/").build();
 
 		var resolver = new HateoasSortHandlerMethodArgumentResolver();
-		assertThat(resolver.getSortTemplateVariables(null, uriComponents).toString()).isEqualTo("{?sort}");
+		assertThat(resolver.getSortTemplateVariables(null, uriComponents).toString()).isEqualTo("{?sort*}");
 	}
 
 	@Test // DATACMNS-1752
@@ -65,7 +65,7 @@ void enhanceTemplateVariables(){
 		UriComponents uriComponents = UriComponentsBuilder.fromPath("/").build();
 
 		HateoasSortHandlerMethodArgumentResolver resolver = new HateoasSortHandlerMethodArgumentResolver();
-		assertThat(resolver.enhance(TemplateVariables.NONE, uriComponents, null).toString()).isEqualTo("{?sort}");
+		assertThat(resolver.enhance(TemplateVariables.NONE, uriComponents, null).toString()).isEqualTo("{?sort*}");
 	}
 
 	private void assertUriStringFor(Sort sort, String expected) throws Exception {