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

Revert "Properly render sort variable variable as composite."

Browse Source 
This reverts commit fa9d7bdce7 as the change has too many side effects to be included in a bugfix version.

Related ticket: GH-2531.
This commit is contained in:
Oliver Drotbohm
2023-12-12 21:11:17 +01:00
parent 144051b56d
commit 9c99164ad6
3 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/springframework/data/web/HateoasSortHandlerMethodArgumentResolver.java
View File

@@ -35,7 +35,6 @@ import org.springframework.web.util.UriComponentsBuilder;
* @author Oliver Gierke
* @author Thomas Darimont
* @author Nick Williams
* @author Julien Béti
*/
public class HateoasSortHandlerMethodArgumentResolver extends SortHandlerMethodArgumentResolver
implements UriComponentsContributor {
@@ -59,7 +58,7 @@ public class HateoasSortHandlerMethodArgumentResolver extends SortHandlerMethodA
String description = String.format("pagination.%s.description", sortParameter);
TemplateVariable.VariableType type = append ? REQUEST_PARAM_CONTINUED : REQUEST_PARAM;
return new TemplateVariables(new TemplateVariable(sortParameter, type, description).composite());
return new TemplateVariables(new TemplateVariable(sortParameter, type, description));
}
@Override

15
src/test/java/org/springframework/data/web/HateoasPageableHandlerMethodArgumentResolverUnitTests.java
View File

@@ -28,7 +28,6 @@ import org.springframework.web.util.UriComponentsBuilder;
* Unit tests for {@link HateoasPageableHandlerMethodArgumentResolver}.
*
* @author Oliver Gierke
* @author Julien Béti
*/
class HateoasPageableHandlerMethodArgumentResolverUnitTests
extends PageableHandlerMethodArgumentResolverUnitTests {
@@ -67,18 +66,18 @@ class HateoasPageableHandlerMethodArgumentResolverUnitTests
assertUriStringFor(PageRequest.of(0, 200), "page=0&size=100");
}
@Test // DATACMNS-418, GH-2531
@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", "");
}
@Test // DATACMNS-418, GH-2531
@Test // DATACMNS-418
void returnsCustomizedTemplateVariables() {
var uriComponents = UriComponentsBuilder.fromPath("/foo").build();
@@ -87,7 +86,7 @@ class HateoasPageableHandlerMethodArgumentResolverUnitTests
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

5
src/test/java/org/springframework/data/web/HateoasSortHandlerMethodArgumentResolverUnitTests.java
View File

@@ -28,7 +28,6 @@ import org.springframework.web.util.UriComponentsBuilder;
* Unit tests for {@link HateoasSortHandlerMethodArgumentResolver}
*
* @author Oliver Gierke
* @author Julien Béti
*/
class HateoasSortHandlerMethodArgumentResolverUnitTests extends SortHandlerMethodArgumentResolverUnitTests {
@@ -47,13 +46,13 @@ class HateoasSortHandlerMethodArgumentResolverUnitTests extends SortHandlerMetho
assertUriStringFor(SORT, "/?sort=firstname,lastname,desc", "/?sort=foo,asc");
}
@Test // DATACMNS-418, GH-2531
@Test // DATACMNS-418
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}");
}
private void assertUriStringFor(Sort sort, String expected) throws Exception {