Skip to content

Commit fc4f42f

Browse files
Julien Bétireda-alaoui
Julien Béti
authored andcommitted
2531 HateoasSortHandlerMethodArgumentResolver should append * to the 'sort' parameter template variable
Fixing tests
1 parent 4100df6 commit fc4f42f

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/test/java/org/springframework/data/web/HateoasPageableHandlerMethodArgumentResolverUnitTests.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ void preventsPageSizeFromExceedingMayValueIfConfiguredOnWrite() throws Exception
7373
@Test // DATACMNS-418
7474
void appendsTemplateVariablesCorrectly() {
7575

76-
assertTemplateEnrichment("/foo", "{?page,size,sort}");
77-
assertTemplateEnrichment("/foo?bar=1", "{&page,size,sort}");
78-
assertTemplateEnrichment("/foo?page=1", "{&size,sort}");
79-
assertTemplateEnrichment("/foo?page=1&size=10", "{&sort}");
76+
assertTemplateEnrichment("/foo", "{?page,size,sort*}");
77+
assertTemplateEnrichment("/foo?bar=1", "{&page,size,sort*}");
78+
assertTemplateEnrichment("/foo?page=1", "{&size,sort*}");
79+
assertTemplateEnrichment("/foo?page=1&size=10", "{&sort*}");
8080
assertTemplateEnrichment("/foo?page=1&sort=foo,asc", "{&size}");
8181
assertTemplateEnrichment("/foo?page=1&size=10&sort=foo,asc", "");
8282
}
@@ -90,7 +90,7 @@ void returnsCustomizedTemplateVariables() {
9090
resolver.setPageParameterName("foo");
9191
var variables = resolver.getPaginationTemplateVariables(null, uriComponents).toString();
9292

93-
assertThat(variables).isEqualTo("{?foo,size,sort}");
93+
assertThat(variables).isEqualTo("{?foo,size,sort*}");
9494
}
9595

9696
@Test // DATACMNS-563
@@ -128,7 +128,7 @@ void enhanceTemplateVariables() {
128128
resolver.setPageParameterName("foo");
129129
String variables = resolver.enhance(TemplateVariables.NONE, uriComponents, null).toString();
130130

131-
assertThat(variables).isEqualTo("{?foo,size,sort}");
131+
assertThat(variables).isEqualTo("{?foo,size,sort*}");
132132
}
133133

134134
@Override

src/test/java/org/springframework/data/web/HateoasSortHandlerMethodArgumentResolverUnitTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ void returnCorrectTemplateVariables() {
5656
var uriComponents = UriComponentsBuilder.fromPath("/").build();
5757

5858
var resolver = new HateoasSortHandlerMethodArgumentResolver();
59-
assertThat(resolver.getSortTemplateVariables(null, uriComponents).toString()).isEqualTo("{?sort}");
59+
assertThat(resolver.getSortTemplateVariables(null, uriComponents).toString()).isEqualTo("{?sort*}");
6060
}
6161

6262
@Test // DATACMNS-1752
@@ -65,7 +65,7 @@ void enhanceTemplateVariables(){
6565
UriComponents uriComponents = UriComponentsBuilder.fromPath("/").build();
6666

6767
HateoasSortHandlerMethodArgumentResolver resolver = new HateoasSortHandlerMethodArgumentResolver();
68-
assertThat(resolver.enhance(TemplateVariables.NONE, uriComponents, null).toString()).isEqualTo("{?sort}");
68+
assertThat(resolver.enhance(TemplateVariables.NONE, uriComponents, null).toString()).isEqualTo("{?sort*}");
6969
}
7070

7171
private void assertUriStringFor(Sort sort, String expected) throws Exception {

0 commit comments

Comments
 (0)